diff --git a/pokeyellow.map b/pokeyellow.map
index f07a97f9..0b7c4066 100644
--- a/pokeyellow.map
+++ b/pokeyellow.map
@@ -1118,8 +1118,8 @@ ROM0 bank #0:
 	         $3e7e = BankswitchCommon
 	         $3e84 = Bankswitch
 	         $3e98 = JumpToAddress
-	         $3e99 = SwitchSRAMBankAndLatchClockData
-	         $3ea9 = PrepareRTCDataAndDisableSRAM
+	         $3e99 = OpenSRAM
+	         $3ea9 = CloseSRAM
 	         $3eb4 = Predef
 	         $3ed2 = Predef.done
 	         $3ed7 = GetPredefRegisters
@@ -12739,8 +12739,8 @@ ROMX bank #28:
 	         $7e80 = ClearSAV
 	         $7e85 = ClearSAV.loop
 	         $7e91 = PadSRAM_FF
-	         $7e9f = EnableSRAMAndLatchClockData
-	         $7eaa = DisableSRAMAndPrepareClockData
+	         $7e9f = EnableSRAM
+	         $7eaa = DisableSRAM
 	EMPTY: $7eb3-$7fff ($014d bytes)
 	TOTAL EMPTY: $014d bytes
 
diff --git a/pokeyellow.sym b/pokeyellow.sym
index bc66c578..0af1daf0 100644
--- a/pokeyellow.sym
+++ b/pokeyellow.sym
@@ -1093,8 +1093,8 @@
 00:3e7e BankswitchCommon
 00:3e84 Bankswitch
 00:3e98 JumpToAddress
-00:3e99 SwitchSRAMBankAndLatchClockData
-00:3ea9 PrepareRTCDataAndDisableSRAM
+00:3e99 OpenSRAM
+00:3ea9 CloseSRAM
 00:3eb4 Predef
 00:3ed2 Predef.done
 00:3ed7 GetPredefRegisters
@@ -12533,8 +12533,8 @@
 1c:7e80 ClearSAV
 1c:7e85 ClearSAV.loop
 1c:7e91 PadSRAM_FF
-1c:7e9f EnableSRAMAndLatchClockData
-1c:7eaa DisableSRAMAndPrepareClockData
+1c:7e9f EnableSRAM
+1c:7eaa DisableSRAM
 1d:4000 CopycatsHouse1F_Blocks
 1d:4010 PewterMart_Blocks
 1d:4010 CinnabarMart_Blocks
diff --git a/pokeyellow_debug.map b/pokeyellow_debug.map
index 27ae0f4a..2eb77d34 100644
--- a/pokeyellow_debug.map
+++ b/pokeyellow_debug.map
@@ -1119,8 +1119,8 @@ ROM0 bank #0:
 	         $3e8d = BankswitchCommon
 	         $3e93 = Bankswitch
 	         $3ea7 = JumpToAddress
-	         $3ea8 = SwitchSRAMBankAndLatchClockData
-	         $3eb8 = PrepareRTCDataAndDisableSRAM
+	         $3ea8 = OpenSRAM
+	         $3eb8 = CloseSRAM
 	         $3ec3 = Predef
 	         $3ee1 = Predef.done
 	         $3ee6 = GetPredefRegisters
@@ -12747,8 +12747,8 @@ ROMX bank #28:
 	         $7e80 = ClearSAV
 	         $7e85 = ClearSAV.loop
 	         $7e91 = PadSRAM_FF
-	         $7e9f = EnableSRAMAndLatchClockData
-	         $7eaa = DisableSRAMAndPrepareClockData
+	         $7e9f = EnableSRAM
+	         $7eaa = DisableSRAM
 	EMPTY: $7eb3-$7fff ($014d bytes)
 	TOTAL EMPTY: $014d bytes
 
@@ -20920,8 +20920,8 @@ ROMX bank #63:
 	         $72e2 = Func_ff2d1.asm_ff2e2
 	         $72eb = Data_ff2eb
 	         $72f3 = Func_ff2f3
-	         $7316 = Func_ff316
-	         $7321 = Func_ff321
+	         $7316 = DebugEnableSRAM
+	         $7321 = DebugDisableSRAM
 	         $732a = Func_ff32a
 	         $732c = Func_ff32a.asm_ff32c
 	SECTION: $7337-$7f36 ($0c00 bytes) ["NPC Sprites 3"]
diff --git a/pokeyellow_debug.sym b/pokeyellow_debug.sym
index 4e562070..66ba4bbf 100644
--- a/pokeyellow_debug.sym
+++ b/pokeyellow_debug.sym
@@ -1094,8 +1094,8 @@
 00:3e8d BankswitchCommon
 00:3e93 Bankswitch
 00:3ea7 JumpToAddress
-00:3ea8 SwitchSRAMBankAndLatchClockData
-00:3eb8 PrepareRTCDataAndDisableSRAM
+00:3ea8 OpenSRAM
+00:3eb8 CloseSRAM
 00:3ec3 Predef
 00:3ee1 Predef.done
 00:3ee6 GetPredefRegisters
@@ -12541,8 +12541,8 @@
 1c:7e80 ClearSAV
 1c:7e85 ClearSAV.loop
 1c:7e91 PadSRAM_FF
-1c:7e9f EnableSRAMAndLatchClockData
-1c:7eaa DisableSRAMAndPrepareClockData
+1c:7e9f EnableSRAM
+1c:7eaa DisableSRAM
 1d:4000 CopycatsHouse1F_Blocks
 1d:4010 PewterMart_Blocks
 1d:4010 CinnabarMart_Blocks
@@ -20519,8 +20519,8 @@
 3f:72e2 Func_ff2d1.asm_ff2e2
 3f:72eb Data_ff2eb
 3f:72f3 Func_ff2f3
-3f:7316 Func_ff316
-3f:7321 Func_ff321
+3f:7316 DebugEnableSRAM
+3f:7321 DebugDisableSRAM
 3f:732a Func_ff32a
 3f:732c Func_ff32a.asm_ff32c
 3f:7337 OfficerJennySprite
diff --git a/pokeyellow_vc.map b/pokeyellow_vc.map
index 76a06704..a834642f 100644
--- a/pokeyellow_vc.map
+++ b/pokeyellow_vc.map
@@ -1125,8 +1125,8 @@ ROM0 bank #0:
 	         $3e7e = BankswitchCommon
 	         $3e84 = Bankswitch
 	         $3e98 = JumpToAddress
-	         $3e99 = SwitchSRAMBankAndLatchClockData
-	         $3ea9 = PrepareRTCDataAndDisableSRAM
+	         $3e99 = OpenSRAM
+	         $3ea9 = CloseSRAM
 	         $3eb4 = Predef
 	         $3ed2 = Predef.done
 	         $3ed7 = GetPredefRegisters
@@ -12768,8 +12768,8 @@ ROMX bank #28:
 	         $7e80 = ClearSAV
 	         $7e85 = ClearSAV.loop
 	         $7e91 = PadSRAM_FF
-	         $7e9f = EnableSRAMAndLatchClockData
-	         $7eaa = DisableSRAMAndPrepareClockData
+	         $7e9f = EnableSRAM
+	         $7eaa = DisableSRAM
 	EMPTY: $7eb3-$7fff ($014d bytes)
 	TOTAL EMPTY: $014d bytes
 
diff --git a/pokeyellow_vc.sym b/pokeyellow_vc.sym
index 64b01c5c..ec3a8f19 100644
--- a/pokeyellow_vc.sym
+++ b/pokeyellow_vc.sym
@@ -1100,8 +1100,8 @@
 00:3e7e BankswitchCommon
 00:3e84 Bankswitch
 00:3e98 JumpToAddress
-00:3e99 SwitchSRAMBankAndLatchClockData
-00:3ea9 PrepareRTCDataAndDisableSRAM
+00:3e99 OpenSRAM
+00:3ea9 CloseSRAM
 00:3eb4 Predef
 00:3ed2 Predef.done
 00:3ed7 GetPredefRegisters
@@ -12562,8 +12562,8 @@
 1c:7e80 ClearSAV
 1c:7e85 ClearSAV.loop
 1c:7e91 PadSRAM_FF
-1c:7e9f EnableSRAMAndLatchClockData
-1c:7eaa DisableSRAMAndPrepareClockData
+1c:7e9f EnableSRAM
+1c:7eaa DisableSRAM
 1d:4000 CopycatsHouse1F_Blocks
 1d:4010 PewterMart_Blocks
 1d:4010 CinnabarMart_Blocks