diff --git a/Makefile b/Makefile
index bff4481..4629822 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,25 @@
+APP_NAME := expansion
+ENTRY_POINT = ./src/$(APP_NAME).cr
+
 .PHONY: build-docker
 build-docker:
 	docker pull alpine:edge
-	docker build -t village-crystal .
+	docker build -t $(APP_NAME)-crystal .
+
+.PHONY: build
+build:
+	mkdir -p build
+	./crystal build $(ENTRY_POINT) --release --no-debug --static -o build/$(APP_NAME)
+
+.PHONY: run
+run: format
+	./crystal run $(ENTRY_POINT)
 
 .PHONY: format
 format:
-	./cr tool format ./src ./spec
+	./crystal tool format ./src ./spec
 
 .PHONY: spec
 spec: format
-	./cr spec --warnings all --error-on-warnings
+	./crystal spec --warnings all --error-on-warnings
 
-.PHONY: release
-release:
-	mkdir -p build
-	./cr build ./src/village.cr --release --no-debug --static -o build/village
diff --git a/cr b/crystal
similarity index 76%
rename from cr
rename to crystal
index 17862fc..348e9cc 100755
--- a/cr
+++ b/crystal
@@ -6,4 +6,4 @@ docker run -it \
 	-u "$(id -u):$(id -g)" \
 	-v "$PWD:/app" \
 	-w "/app" \
-	village-crystal crystal "$@"
+	expansion-crystal crystal "$@"
diff --git a/shards b/shards
index 4d4974a..ce0a53b 100755
--- a/shards
+++ b/shards
@@ -6,4 +6,4 @@ docker run -it \
 	-u "$(id -u):$(id -g)" \
 	-v "$PWD:/app" \
 	-w "/app" \
-	village-crystal shards "$@"
+	expansion-crystal shards "$@"
diff --git a/spec/village_spec.cr b/spec/expansion_spec.cr
similarity index 100%
rename from spec/village_spec.cr
rename to spec/expansion_spec.cr
diff --git a/spec/spec_helper.cr b/spec/spec_helper.cr
index 0af9d20..e2f4f80 100644
--- a/spec/spec_helper.cr
+++ b/spec/spec_helper.cr
@@ -1,2 +1 @@
 require "spec"
-require "../src/village"
diff --git a/src/village.cr b/src/expansion.cr
similarity index 100%
rename from src/village.cr
rename to src/expansion.cr