--- a/world/Makefile	Thu Oct 12 11:29:21 2017 +0300
+++ b/world/Makefile	Thu Oct 12 11:43:43 2017 +0300
@@ -4,10 +4,10 @@
 ###
 ### Main targets
 ###
-TARGETS=$(addsuffix .html,$(MAPLIST)) \
-	$(addsuffix .ansi,$(MAPLIST)) \
-	$(addsuffix .png,$(MAPLIST)) \
-	$(addsuffix .htm,$(MAPLIST)) \
+TARGETS=$(addsuffix .html,$(WORLD_MAPS)) \
+	$(addsuffix .ansi,$(WORLD_MAPS)) \
+	$(addsuffix .png,$(WORLD_MAPS)) \
+	$(addsuffix .htm,$(WORLD_MAPS)) \
 	util.js
 
 
@@ -32,11 +32,11 @@
 ###
 ### Maps
 ###
-maps: $(addsuffix .ppm,$(MAPLIST)) $(TARGETS)
+maps: $(addsuffix .ppm,$(WORLD_MAPS)) $(TARGETS)
 
 include Makefile.inc
 
-LOCLIST=$(addsuffix .loc,$(MAPLIST)) special.loc limbo.loc
+LOCLIST=$(addsuffix .loc,$(WORLD_MAPS)) special.loc limbo.loc
 
 ###
 ### Special targets
@@ -48,7 +48,7 @@
 	@touch $@
 
 # Open PNG files in Gimp
-gimp: $(addsuffix .png,$(MAPLIST))
+gimp: $(addsuffix .png,$(WORLD_MAPS))
 	-@ls -lt $+ gimp
 	@gimp $+ && touch $@
 	-@ls -lt $+ gimp
@@ -59,7 +59,7 @@
 
 # Fetch raw ASCII maps from bat.org to *.new
 fetch:
-	for i in $(MAPMAP); do wget -O "$$i.new" "$(BATMAPURL)$$i.txt"; done
+	for i in $(CONT_MAPS); do wget -O "$$i.new" "$(BATMAPURL)$$i.txt"; done
 
 
 # Remove all temporary .diff files
@@ -68,7 +68,7 @@
 
 # Diff target - run diff for each .map and .new (fetched via 'fetch' target).
 # Finally do 'hg diff' to show changes.
-diff: cleardiff $(addsuffix .diff,$(MAPMAP))
+diff: cleardiff $(addsuffix .diff,$(CONT_MAPS))
 	@hg diff .
 
 %.js: ../%.js