3 files changed, 6 insertions, 6 deletions
diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt
index db8d25b24..db00884c0 100644
--- a/npc/000-2-1/_warps.txt
+++ b/npc/000-2-1/_warps.txt
@@ -1,2 +1,2 @@
 // Map 000-2-1: La Johanne, Second Deck
-000-2-1,72,30,0	warp	ToLevel0	0,0,000-2-0,31,26
+000-2-1,72,30,0	warp	ToLevel0#000-2-1	0,0,000-2-0,31,26
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index b89ae52db..debf5aec7 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -7,7 +7,7 @@
 
 // Size = 2
 // Gender = 1
-000-2-1,53,38,0	script	Q'Onan	402,{
+000-2-1,53,38,0	script	Q'Onan#000-2-1	402,{
 
     callfunc "Asleep";
 }
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index 15b5e5d24..25930a9a8 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -6,28 +6,28 @@
 
 // Size = 2
 // Gender = 2
-000-2-1,40,37,0	script	#name	901,{
+000-2-1,40,37,0	script	#name1	901,{
     callfunc "SavePoint", "000-2-1.gat", 40, 37;
     close;
 }
 
 // Size = 2
 // Gender = 2
-000-2-1,46,37,0	script	#name	901,{
+000-2-1,46,37,0	script	#name2	901,{
     callfunc "SavePoint", "000-2-1.gat", 46, 37;
     close;
 }
 
 // Size = 2
 // Gender = 2
-000-2-1,50,38,0	script	#name	901,{
+000-2-1,50,38,0	script	#name3	901,{
     callfunc "SavePoint", "000-2-1.gat", 50, 38;
     close;
 }
 
 // Size = 2
 // Gender = 2
-000-2-1,55,40,0	script	#name	901,{
+000-2-1,55,40,0	script	#name4	901,{
     callfunc "SavePoint", "000-2-1.gat", 55, 40;
     close;
 }