diff --git a/plugins/mapexport/proto/Tile.proto b/plugins/mapexport/proto/Tile.proto
index 09ab931e8..57c8ef049 100644
--- a/plugins/mapexport/proto/Tile.proto
+++ b/plugins/mapexport/proto/Tile.proto
@@ -5,29 +5,23 @@ message Tile
 {
     enum TileType
     {
-            EMPTY = 0;
-            WALL = 1;
-            PILLAR = 2;
-            BROOK_BED = 3;
-            FORTIFICATION = 4;
-            STAIR_UP = 5;
-            STAIR_DOWN = 6;
-            STAIR_UPDOWN = 7;
-            RAMP = 8;
-            RAMP_TOP = 9;
-            FLOOR = 10;
-            BROOK_TOP = 11;
-            RIVER_BED = 12;
-            POOL = 13;
-            TREE_DEAD = 14;
-            TREE_OK = 15;
-            SAPLING_DEAD = 16;
-            SAPLING_OK = 17;
-            SHRUB_DEAD = 18;
-            SHRUB_OK = 19;
-            BOULDER = 20;
-            PEBLLES = 21;
-            ENDLESS_PIT = 22;
+		EMPTY = 0;
+		FLOOR = 1;
+		BOULDER = 2;
+		PEBBLES = 3;
+		WALL = 4;
+		FORTIFICATION = 5;
+		STAIR_UP = 6;
+		STAIR_DOWN = 7;
+		STAIR_UPDOWN = 8;
+		RAMP = 9;
+		RAMP_TOP = 10;
+		BROOK_BED = 11;
+		BROOK_TOP = 12;
+		TREE = 13;
+		SAPLING = 14;
+		SHRUB = 15;
+		ENDLESS_PIT = 16;
     }
     enum LiquidType
     {
@@ -39,22 +33,24 @@ message Tile
         AIR = 0;
         SOIL = 1;
         STONE = 2;
-        FEATSTONE = 3;
-        OBSIDIAN = 4;
-        VEIN = 5;
-        ICE = 6;
-        GRASS = 7;
-        GRASS2 = 8;
-        GRASS_DEAD = 9;
+        FEATURE = 3;
+        LAVA_STONE = 4;
+        MINERAL = 5;
+        FROZE_LIQUID = 6;
+        CONSTRUCTION = 7;
+        GRASS_LIGHT = 8;
+        GRASS_DARK = 9;
         GRASS_DRY = 10;
-        DRIFTWOOD = 11;
+        GRASS_DEAD = 11;
         HFS = 12;
-        MAGMA_TYPE = 13;
-        CAMPFIRE = 14;
-        FIRE = 15;
-        ASHES = 16;
-        CONSTRUCTED = 17;
-        CYAN_GLOW = 18;
+        CAMPFIRE = 13;
+        FIRE = 14;
+        ASHES = 15;
+        MAGMA_TYPE = 16;
+        DRIFTWOOD = 17;
+        POOL = 18;
+		BROOK = 19;
+		RIVER = 20;
     }
     required uint32 x = 1;
     required uint32 y = 2;