6 files changed, 28 insertions, 28 deletions
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index 83181eaa..cf9b47d3 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -31,8 +31,8 @@
  <tileset firstgid="979" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="128" height="192"/>
  </tileset>
- <tileset firstgid="1003" name="Box x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box_x2.png" width="128" height="64"/>
+ <tileset firstgid="1003" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
  <layer name="Ground" width="47" height="47">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 00c7f51d..587c862f 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -24,11 +24,11 @@
  <tileset firstgid="723" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="979" name="Tree x3" tilewidth="96" tileheight="96">
-  <image source="../graphics/tilesets/tree_x3.png" width="96" height="96"/>
+ <tileset firstgid="979" name="Tree x3x3" tilewidth="96" tileheight="96">
+  <image source="../graphics/tilesets/tree-x3x3.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="980" name="Tree x4" tilewidth="96" tileheight="128">
-  <image source="../graphics/tilesets/tree_x4.png" width="480" height="256"/>
+ <tileset firstgid="980" name="Tree x3x4" tilewidth="96" tileheight="128">
+  <image source="../graphics/tilesets/tree-x3x4.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="990" name="Accessories" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/accessories.png" width="512" height="64"/>
@@ -36,8 +36,8 @@
  <tileset firstgid="1022" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="128" height="192"/>
  </tileset>
- <tileset firstgid="1046" name="Box x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box_x2.png" width="128" height="64"/>
+ <tileset firstgid="1046" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
  <layer name="Ground" width="120" height="160">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 1af741c5..73a2288b 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -20,14 +20,14 @@
  <tileset firstgid="415" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="421" name="Box x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box_x2.png" width="128" height="64"/>
+ <tileset firstgid="421" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="425" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="489" name="ship-sunlight_x5" tilewidth="32" tileheight="160">
-  <image source="../graphics/tilesets/ship-sunlight_x5.png" width="128" height="160"/>
+ <tileset firstgid="489" name="Sunlight x4x5" tilewidth="32" tileheight="160">
+  <image source="../graphics/tilesets/ship-sunlight-x4x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 650f2ff7..14ed87ae 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -21,14 +21,14 @@
  <tileset firstgid="415" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="421" name="Ship Indoor x3" tilewidth="64" tileheight="128">
-  <image source="../graphics/tilesets/ship-indoor_x4.png" width="64" height="128"/>
+ <tileset firstgid="421" name="Ship Indoor x2x4" tilewidth="64" tileheight="128">
+  <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="422" name="Box x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box_x2.png" width="128" height="64"/>
+ <tileset firstgid="422" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="426" name="ship-sunlight" tilewidth="32" tileheight="128">
-  <image source="../graphics/tilesets/ship-sunlight_x5.png" width="128" height="160"/>
+ <tileset firstgid="426" name="Sunlight x4x5" tilewidth="32" tileheight="128">
+  <image source="../graphics/tilesets/ship-sunlight-x4x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="93" height="59" opacity="0.99">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index e5ca202d..abd76898 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -24,14 +24,14 @@
  <tileset firstgid="479" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="485" name="Ship Indoor x3" tilewidth="64" tileheight="128">
-  <image source="../graphics/tilesets/ship-indoor_x4.png" width="64" height="128"/>
+ <tileset firstgid="485" name="Ship Indoor x2x4" tilewidth="64" tileheight="128">
+  <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="486" name="Box x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box_x2.png" width="128" height="64"/>
+ <tileset firstgid="486" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="490" name="ship-sunlight_x5" tilewidth="32" tileheight="160">
-  <image source="../graphics/tilesets/ship-sunlight_x5.png" width="128" height="160"/>
+ <tileset firstgid="490" name="Sunlight x4x5" tilewidth="32" tileheight="160">
+  <image source="../graphics/tilesets/ship-sunlight-x4x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="70" height="62">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 4672d9d9..d219fe64 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -22,14 +22,14 @@
  <tileset firstgid="418" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="424" name="Box x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box_x2.png" width="128" height="64"/>
+ <tileset firstgid="424" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="428" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="492" name="ship-sunlight_x5" tilewidth="32" tileheight="160">
-  <image source="../graphics/tilesets/ship-sunlight_x5.png" width="128" height="160"/>
+ <tileset firstgid="492" name="Sunlight x4x5" tilewidth="32" tileheight="160">
+  <image source="../graphics/tilesets/ship-sunlight-x4x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="gzip">