diff --git a/TileGenerator.cpp b/TileGenerator.cpp
index ceca10f..24ddb91 100644
--- a/TileGenerator.cpp
+++ b/TileGenerator.cpp
@@ -163,8 +163,8 @@ TileGenerator::TileGenerator():
 	m_mapXEndNodeOffset(0),
 	m_mapYEndNodeOffset(0),
 	m_nextStoredYCoord(0),
-	m_tileXOrigin(TILE_WORLDCENTERED),
-	m_tileZOrigin(TILE_WORLDCENTERED),
+	m_tileXOrigin(TILECENTER_AT_WORLDCENTER),
+	m_tileZOrigin(TILECENTER_AT_WORLDCENTER),
 	m_tileWidth(0),
 	m_tileHeight(0),
 	m_tileBorderSize(1),
@@ -887,16 +887,16 @@ void TileGenerator::computeMapParameters()
 	// Set special values for origin (which depend on other paramters)
 	if (m_tileWidth) {
 		switch (m_tileXOrigin) {
-		case TILE_WORLDCENTERED:
+		case TILECENTER_AT_WORLDCENTER:
 			m_tileXOrigin = -m_tileWidth / 2;
 			break;
-		case TILE_AT_WORLDCENTER:
+		case TILECORNER_AT_WORLDCENTER:
 			m_tileXOrigin = 0;
 			break;
-		case TILE_MAPCENTERED:
+		case TILECENTER_AT_MAPCENTER:
 			m_tileXOrigin = m_xMin * 16 + m_mapXStartNodeOffset + mapWidth / 2 - m_tileWidth / 2;
 			break;
-		case TILE_AT_MAPCENTER:
+		case TILECORNER_AT_MAPCENTER:
 			m_tileXOrigin = m_xMin * 16 + m_mapXStartNodeOffset + mapWidth / 2;
 			break;
 		default:
@@ -907,16 +907,16 @@ void TileGenerator::computeMapParameters()
 	}
 	if (m_tileHeight) {
 		switch (m_tileZOrigin) {
-		case TILE_WORLDCENTERED:
+		case TILECENTER_AT_WORLDCENTER:
 			m_tileZOrigin = -m_tileHeight / 2;
 			break;
-		case TILE_AT_WORLDCENTER:
+		case TILECORNER_AT_WORLDCENTER:
 			m_tileZOrigin = 0;
 			break;
-		case TILE_MAPCENTERED:
+		case TILECENTER_AT_MAPCENTER:
 			m_tileZOrigin = (m_zMax + 1) * 16 - 1 - m_mapYStartNodeOffset - mapHeight / 2 - m_tileHeight / 2;
 			break;
-		case TILE_AT_MAPCENTER:
+		case TILECORNER_AT_MAPCENTER:
 			m_tileZOrigin = (m_zMax + 1) * 16 - 1 - m_mapYStartNodeOffset - mapHeight / 2;
 			break;
 		default:
diff --git a/TileGenerator.h b/TileGenerator.h
index f203bda..ba73a7f 100644
--- a/TileGenerator.h
+++ b/TileGenerator.h
@@ -29,10 +29,10 @@
 #include "Color.h"
 #include "db.h"
 
-#define TILE_WORLDCENTERED	INT_MAX
-#define TILE_AT_WORLDCENTER	(INT_MAX - 1)
-#define TILE_MAPCENTERED	INT_MIN
-#define TILE_AT_MAPCENTER	(INT_MIN + 1)
+#define TILECENTER_AT_WORLDCENTER	(INT_MAX)
+#define TILECORNER_AT_WORLDCENTER	(INT_MAX - 1)
+#define TILECENTER_AT_MAPCENTER		(INT_MIN)
+#define TILECORNER_AT_MAPCENTER		(INT_MIN + 1)
 
 class TileGenerator
 {
diff --git a/mapper.cpp b/mapper.cpp
index f945505..477bb8c 100644
--- a/mapper.cpp
+++ b/mapper.cpp
@@ -726,15 +726,15 @@ int main(int argc, char *argv[])
 						NodeCoord coord;
 						if (iss.str() == "world") {
 							if (origin)
-								generator.setTileOrigin(TILE_AT_WORLDCENTER, TILE_AT_WORLDCENTER);
+								generator.setTileOrigin(TILECORNER_AT_WORLDCENTER, TILECORNER_AT_WORLDCENTER);
 							else
-								generator.setTileCenter(TILE_WORLDCENTERED, TILE_WORLDCENTERED);
+								generator.setTileCenter(TILECENTER_AT_WORLDCENTER, TILECENTER_AT_WORLDCENTER);
 						}
 						else if (iss.str() == "map") {
 							if (origin)
-								generator.setTileOrigin(TILE_AT_MAPCENTER, TILE_AT_MAPCENTER);
+								generator.setTileOrigin(TILECORNER_AT_MAPCENTER, TILECORNER_AT_MAPCENTER);
 							else
-								generator.setTileCenter(TILE_MAPCENTERED, TILE_MAPCENTERED);
+								generator.setTileCenter(TILECENTER_AT_MAPCENTER, TILECENTER_AT_MAPCENTER);
 						}
 						else {
 							bool result = true;