From b7a4a6759f9b7f83dea86c2d42d167fea76d6a2c Mon Sep 17 00:00:00 2001
From: Alige <gauvain.dauchy@free.fr>
Date: Tue, 14 Jun 2016 11:04:49 +0200
Subject: Fixed the names of maps for more coherence with names in serverdata.

---
 maps/000-0-0.tmx  | 12 ++++++------
 maps/000-0-1.tmx  |  2 +-
 maps/000-2-4.tmx  | 18 +++++++++---------
 maps/001-1.tmx    |  2 +-
 maps/001-2-0.tmx  |  2 +-
 maps/001-2-1.tmx  |  2 +-
 maps/001-2-10.tmx |  2 +-
 maps/001-2-11.tmx |  2 +-
 maps/001-2-12.tmx |  2 +-
 maps/001-2-13.tmx |  2 +-
 maps/001-2-14.tmx |  2 +-
 maps/001-2-15.tmx |  2 +-
 maps/001-2-16.tmx |  2 +-
 maps/001-2-17.tmx |  2 +-
 maps/001-2-18.tmx |  2 +-
 maps/001-2-19.tmx |  2 +-
 maps/001-2-2.tmx  |  2 +-
 maps/001-2-20.tmx |  2 +-
 maps/001-2-25.tmx |  2 +-
 maps/001-2-26.tmx |  2 +-
 maps/001-2-27.tmx |  2 +-
 maps/001-2-28.tmx |  2 +-
 maps/001-2-29.tmx |  2 +-
 maps/001-2-3.tmx  |  2 +-
 maps/001-2-30.tmx |  2 +-
 maps/001-2-31.tmx |  2 +-
 maps/001-2-32.tmx |  2 +-
 maps/001-2-33.tmx |  2 +-
 maps/001-2-34.tmx |  2 +-
 maps/001-2-35.tmx |  2 +-
 maps/001-2-36.tmx |  2 +-
 maps/001-2-37.tmx |  2 +-
 maps/001-2-38.tmx |  2 +-
 maps/001-2-39.tmx |  2 +-
 maps/001-2-4.tmx  |  2 +-
 maps/001-2-40.tmx |  2 +-
 maps/001-2-5.tmx  |  2 +-
 maps/001-2-6.tmx  |  2 +-
 maps/001-2-7.tmx  |  2 +-
 maps/001-2-8.tmx  |  2 +-
 maps/001-2-9.tmx  |  2 +-
 41 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index 6b76bd86..9a6052ed 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -6,21 +6,21 @@
   <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="La Johanne, First Deck, Sailor's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <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"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="449" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="449" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="485" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="485" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="55" height="55">
diff --git a/maps/000-0-1.tmx b/maps/000-0-1.tmx
index c6295d93..ae299852 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="La Johanne, First Deck, 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-4.tmx b/maps/000-2-4.tmx
index c457d59b..75873bca 100644
--- a/maps/000-2-4.tmx
+++ b/maps/000-2-4.tmx
@@ -6,35 +6,35 @@
   <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 hide"/>
+  <property name="name" value="La Johanne, 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"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <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"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="421" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1">
+ <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="70" height="62">
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 4b9abfa9..a5d2ec97 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"/>
+  <property name="name" value="Artis City"/>
   <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 7d11b370..1d15aaf8 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="Light Armor Shop"/>
+  <property name="name" value="Artis, 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 6de93d9f..603d3f97 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="Moon's House First Floor"/>
+  <property name="name" value="Artis, 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 a5fd42f0..af560b5a 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="Moon's House First Floor"/>
+  <property name="name" value="Artis, 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 fd87a273..63b6a1f1 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="Moon's House First Floor"/>
+  <property name="name" value="Artis, 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 e017f474..f24ae32f 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=""/>
+  <property name="name" value="Artis, 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 9ca77db3..30ec2a49 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=""/>
+  <property name="name" value="Artis, Noble House, 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 ecffed7e..1f828965 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=""/>
+  <property name="name" value="Artis, Noble House, 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 c095e1e9..c4ce9398 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=""/>
+  <property name="name" value="Artis, Geo and Meorwen'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-16.tmx b/maps/001-2-16.tmx
index 8610edfd..2b923622 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=""/>
+  <property name="name" value="Artis, 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 ed3ebef3..f1975c94 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=""/>
+  <property name="name" value="Artis, Harbourmaster Lodge, Left 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-18.tmx b/maps/001-2-18.tmx
index ccd6efec..8df058c3 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=""/>
+  <property name="name" value="Artis, 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 fa3651f0..0d179e87 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=""/>
+  <property name="name" value="Artis, 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 b749354b..b3395f29 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="Moon's House First Floor"/>
+  <property name="name" value="Artis, 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 839ce72d..058fbb7f 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=""/>
+  <property name="name" value="Artis, Merchant Hall, 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-25.tmx b/maps/001-2-25.tmx
index 307ec918..9b889677 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=""/>
+  <property name="name" value="Artis, Merchant Hall, 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 a4abf13a..2f3d176d 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=""/>
+  <property name="name" value="Artis, 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 8cb09f53..3f25b22c 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="Blacksmith Shop"/>
+  <property name="name" value="Artis, 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 89c307e7..f1502641 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="Blacksmith Shop"/>
+  <property name="name" value="Artis, 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 898ccf95..d355f29c 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="Blacksmith Shop"/>
+  <property name="name" value="Artis, Red Plush Inn, 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 8f15fcff..21efd392 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="Moon's House Second Floor"/>
+  <property name="name" value="Artis, Moon's House, 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 dd7e6daf..d18c7b7b 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="Blacksmith Shop"/>
+  <property name="name" value="Artis, Red Plush Inn, 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-31.tmx b/maps/001-2-31.tmx
index 809e8fc8..d8325a86 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-31.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="Blacksmith Shop"/>
+  <property name="name" value=""/>
  </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-32.tmx b/maps/001-2-32.tmx
index 97840cc4..348dbad3 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-32.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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 bbbaa6aa..abd0750c 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="City Hall Left Side"/>
+  <property name="name" value="Artis, Legion of Aemil"/>
  </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-34.tmx b/maps/001-2-34.tmx
index d30b3bc0..e4be815e 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-34.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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-35.tmx b/maps/001-2-35.tmx
index afe41339..d82912d2 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-35.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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-36.tmx b/maps/001-2-36.tmx
index dd0e5221..36967941 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-36.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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-37.tmx b/maps/001-2-37.tmx
index f54d778b..50b89691 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-37.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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-38.tmx b/maps/001-2-38.tmx
index 585f2851..99db4ace 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-38.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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-39.tmx b/maps/001-2-39.tmx
index cd5e1e14..e717d8b9 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-39.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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 f6c9c238..dffc10c2 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="Library's First Floor"/>
+  <property name="name" value="Artis, 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-40.tmx b/maps/001-2-40.tmx
index 9f1067ed..d79be517 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -6,7 +6,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-40.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="City Hall Left Side"/>
+  <property name="name" value=""/>
  </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 bb084609..ed7da726 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="Library's Warehouse"/>
+  <property name="name" value="Artis, Library, 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 a081ba23..90b9f454 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="Library's Second Floor"/>
+  <property name="name" value="Artis, Library, 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 6a113a98..4b3a3c66 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="City Hall Left Side"/>
+  <property name="name" value="Artis, 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 741d1fe8..6b98bfe7 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="City Hall Left Side"/>
+  <property name="name" value="Artis, City Hall, 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 247df13f..55ea2df0 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="City Hall Left Side"/>
+  <property name="name" value="Artis, City Hall, 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"/>
-- 
cgit v1.2.3-70-g09d2