Updated map names, these were too long. Now also more coherent.

40 files changed, 40 insertions, 40 deletions

diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index 9a6052ed..de9b75ab 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-0-0.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, First Deck, Sailor's Room"/>
+  <property name="name" value="Sailor's Room"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/000-0-1.tmx b/maps/000-0-1.tmx
index ae299852..6b8cb643 100644
--- a/maps/000-0-1.tmx
+++ b/maps/000-0-1.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-0-0.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, First Deck, Sailor's Room"/>
+  <property name="name" value="Sailor's Room"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 3a808369..d5bee657 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-0.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, First Deck"/>
+  <property name="name" value="First Deck"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 7d8fd788..f3d1e10b 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-1.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, Second Deck"/>
+  <property name="name" value="Second Deck"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 12aac188..b420eb2d 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-2.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, Hold"/>
+  <property name="name" value="Hold"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 0fda61d3..0e8a4614 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-3.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, Nard's Room"/>
+  <property name="name" value="Nard's Room"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/000-2-4.tmx b/maps/000-2-4.tmx
index 75873bca..318eb2bd 100644
--- a/maps/000-2-4.tmx
+++ b/maps/000-2-4.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-4.png"/>
   <property name="music" value="guitarz-halloween-theme.ogg"/>
-  <property name="name" value="La Johanne, Alige's Hiding Place"/>
+  <property name="name" value="Alige's Hiding Place"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index a5d2ec97..4b9abfa9 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-1.png"/>
   <property name="music" value="bartk - the adventure begins.ogg"/>
-  <property name="name" value="Artis City"/>
+  <property name="name" value="Artis"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 1d15aaf8..7d11b370 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-0.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Light Armor Shop"/>
+  <property name="name" value="Light Armor Shop"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 603d3f97..a20e30b8 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-1.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Noble House"/>
+  <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index af560b5a..7b41357b 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-10.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Noble House"/>
+  <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index 63b6a1f1..ccd65e3d 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-11.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Noble House"/>
+  <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index f24ae32f..1eb2f912 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-12.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Noble House"/>
+  <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 30ec2a49..9dd21312 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-13.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Noble House, First Floor"/>
+  <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index 1f828965..0d1ed711 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-14.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Noble House, Basement"/>
+  <property name="name" value="Basement"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index c4ce9398..5f273078 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-15.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Geo and Meorwen's House"/>
+  <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index 2b923622..b13c13b9 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-16.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Harbourmaster Lodge"/>
+  <property name="name" value="Harbourmaster Lodge"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index f1975c94..dcdba079 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-17.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Harbourmaster Lodge, Left Room"/>
+  <property name="name" value="Backroom"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index 8df058c3..c58103f8 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-18.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Docks Warehouse"/>
+  <property name="name" value="Docks Warehouse"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 0d179e87..3aeb0244 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-19.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Merchant Hall"/>
+  <property name="name" value="Merchant Hall"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index b3395f29..542b70c4 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-2.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Moon's House"/>
+  <property name="name" value="Moon's House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index 058fbb7f..7bc405c8 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-20.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Merchant Hall, Backroom"/>
+  <property name="name" value="Backroom"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx
index dc03ff98..0c24b1c4 100644
--- a/maps/001-2-21.tmx
+++ b/maps/001-2-21.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-0.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, First Deck"/>
+  <property name="name" value="First Deck"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 3936d827..4548dc63 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-1.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, Second Deck"/>
+  <property name="name" value="Second Deck"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index fc018634..eb4ef45e 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-2.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, Hold"/>
+  <property name="name" value="Hold"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx
index e41a53e5..9f55ef47 100644
--- a/maps/001-2-24.tmx
+++ b/maps/001-2-24.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-3.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="La Johanne, Nard's Room"/>
+  <property name="name" value="Nard's Room"/>
  </properties>
  <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 9b889677..4c4aca2c 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-25.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Merchant Hall, Storage Room"/>
+  <property name="name" value="Storage Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index 2f3d176d..663a4817 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-26.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Alchemy Lab"/>
+  <property name="name" value="Alchemy Lab"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index 3f25b22c..8cb09f53 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-27.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Blacksmith Shop"/>
+  <property name="name" value="Blacksmith Shop"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index f1502641..7d184fc9 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-28.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Red Plush Inn"/>
+  <property name="name" value="Red Plush Inn"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index d355f29c..7c8bffb1 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-29.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Red Plush Inn, First Floor"/>
+  <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 21efd392..2c8a30f3 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-3.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Moon's House, First Floor"/>
+  <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index d18c7b7b..757da33c 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-30.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Red Plush Inn, Second Floor"/>
+  <property name="name" value="Second Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index abd0750c..1912c285 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-33.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Legion of Aemil"/>
+  <property name="name" value="Legion of Aemil Headquarters"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index dffc10c2..feb35efc 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-4.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Library"/>
+  <property name="name" value="Library"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index ed7da726..3680fd2a 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-5.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Library, Warehouse"/>
+  <property name="name" value="Warehouse"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 90b9f454..5444cb88 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-6.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, Library, First Floor"/>
+  <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index 4b3a3c66..4c47d453 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-7.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, City Hall"/>
+  <property name="name" value="City Hall"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index 6b98bfe7..6b0d3180 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-8.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, City Hall, Left Wing"/>
+  <property name="name" value="Left Wing"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index 55ea2df0..f4262978 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-9.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Artis, City Hall, Right Wing"/>
+  <property name="name" value="Right Wing"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>