diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
index 30a6b103ca..e2c95109e7 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
@@ -5,16 +5,13 @@
 <td align=center width=176>Blackbird Campsite</td>
 <td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table>
-<br><font color="LEVEL">Infinite Odyssey Areas</font><br1>
-<button action="bypass -h admin_move_to -48042 69232 -3084" value="Blackbird Campsite" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -47803 60858 -3229" value="Atelia Fortress" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -50592 83219 -5134" value="Garden of Spirits" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <br><font color="LEVEL">Nearby Dark Elf Areas</font><br1>
 <button action="bypass -h admin_move_to 25695 11049 -3730" value="Shilen Temple" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -13309 21949 -3714" value="Altar of Evil" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -27476 49487 -3684" value="Bloody Swampland" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<br><font color="LEVEL">Salvation</font><br1>
-<button action="bypass -h admin_move_to -51664 60200 -3347" value="Atelia Refinery Outside" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -59392 52628 -8608" value="Atelia Refinery Inside" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<br><font color="LEVEL">Infinite Odyssey Areas</font><br1>
+<button action="bypass -h admin_move_to -48042 69232 -3084" value="Blackbird Campsite" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to -47803 60858 -3229" value="Atelia Fortress" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to -50592 83219 -5134" value="Garden of Spirits" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
index 30a6b103ca..bcdc122068 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
@@ -5,15 +5,15 @@
 <td align=center width=176>Blackbird Campsite</td>
 <td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table>
-<br><font color="LEVEL">Infinite Odyssey Areas</font><br1>
-<button action="bypass -h admin_move_to -48042 69232 -3084" value="Blackbird Campsite" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -47803 60858 -3229" value="Atelia Fortress" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -50592 83219 -5134" value="Garden of Spirits" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <br><font color="LEVEL">Nearby Dark Elf Areas</font><br1>
 <button action="bypass -h admin_move_to 25695 11049 -3730" value="Shilen Temple" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -13309 21949 -3714" value="Altar of Evil" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -27476 49487 -3684" value="Bloody Swampland" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<br><font color="LEVEL">Salvation</font><br1>
+<br><font color="LEVEL">Infinite Odyssey Areas</font><br1>
+<button action="bypass -h admin_move_to -48042 69232 -3084" value="Blackbird Campsite" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to -47803 60858 -3229" value="Atelia Fortress" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to -50592 83219 -5134" value="Garden of Spirits" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<br><font color="LEVEL">Atelia Refinery</font><br1>
 <button action="bypass -h admin_move_to -51664 60200 -3347" value="Atelia Refinery Outside" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -59392 52628 -8608" value="Atelia Refinery Inside" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/34400-34499.xml
index a98a8dadc0..cacaa4f8d1 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/34400-34499.xml
@@ -779,7 +779,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="34441" level="85" type="Npc" name="Atelia Refinery Teleport Device">
+	<npc id="34441" level="85" type="Teleporter" name="Atelia Refinery Teleport Device">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -798,7 +798,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="34442" level="85" type="Npc" name="Atelia Refinery Teleport Device">
+	<npc id="34442" level="85" type="Teleporter" name="Atelia Refinery Teleport Device">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -817,7 +817,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="34443" level="85" type="Npc" name="Atelia Refinery Teleport Device">
+	<npc id="34443" level="85" type="Teleporter" name="Atelia Refinery Teleport Device">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -836,7 +836,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="34444" level="85" type="Npc" name="Atelia Refinery Teleport Device">
+	<npc id="34444" level="85" type="Teleporter" name="Atelia Refinery Teleport Device">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
index 30a6b103ca..bcdc122068 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/teleports/WorldAreas/BlackbirdCampsite.htm
@@ -5,15 +5,15 @@
 <td align=center width=176>Blackbird Campsite</td>
 <td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table>
-<br><font color="LEVEL">Infinite Odyssey Areas</font><br1>
-<button action="bypass -h admin_move_to -48042 69232 -3084" value="Blackbird Campsite" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -47803 60858 -3229" value="Atelia Fortress" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -50592 83219 -5134" value="Garden of Spirits" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <br><font color="LEVEL">Nearby Dark Elf Areas</font><br1>
 <button action="bypass -h admin_move_to 25695 11049 -3730" value="Shilen Temple" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -13309 21949 -3714" value="Altar of Evil" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -27476 49487 -3684" value="Bloody Swampland" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<br><font color="LEVEL">Salvation</font><br1>
+<br><font color="LEVEL">Infinite Odyssey Areas</font><br1>
+<button action="bypass -h admin_move_to -48042 69232 -3084" value="Blackbird Campsite" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to -47803 60858 -3229" value="Atelia Fortress" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to -50592 83219 -5134" value="Garden of Spirits" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<br><font color="LEVEL">Atelia Refinery</font><br1>
 <button action="bypass -h admin_move_to -51664 60200 -3347" value="Atelia Refinery Outside" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -59392 52628 -8608" value="Atelia Refinery Inside" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center>