diff --git a/src/SHME.ExternalTool/UI/CustomMainForm.cs b/src/SHME.ExternalTool/UI/CustomMainForm.cs
index 1d30913..a413a81 100644
--- a/src/SHME.ExternalTool/UI/CustomMainForm.cs
+++ b/src/SHME.ExternalTool/UI/CustomMainForm.cs
@@ -315,7 +315,7 @@ public override void UpdateValues(ToolFormUpdateType type)
 					}
 					else if (_firstPersonEnabled)
 					{
-						long address = Rom.Addresses.MainRam.ControllerLayout;
+						long address = Rom.Addresses.MainRam.ControllerConfig;
 						string hash = Mem.HashRegion(address, SHME.ExternalTool.ControllerConfig.Size);
 						if (hash != _lastControllerLayoutHash)
 						{
@@ -718,7 +718,7 @@ private void CleanUpDisposables()
 		private SHME.ExternalTool.ControllerConfig _controllerConfig;
 		private void SetButtonNames()
 		{
-			long address = Rom.Addresses.MainRam.ControllerLayout;
+			long address = Rom.Addresses.MainRam.ControllerConfig;
 			IReadOnlyList<byte> bytes = Mem.ReadByteRange(address, SHME.ExternalTool.ControllerConfig.Size);
 			_controllerConfig = new SHME.ExternalTool.ControllerConfig(bytes);
 
diff --git a/src/SHME.ExternalTool/Versions/Addresses.cs b/src/SHME.ExternalTool/Versions/Addresses.cs
index e025099..8ff8e51 100644
--- a/src/SHME.ExternalTool/Versions/Addresses.cs
+++ b/src/SHME.ExternalTool/Versions/Addresses.cs
@@ -88,7 +88,7 @@ public class MainRamAddresses
 
 		public long HarryState { get; set; }
 
-		public long ControllerLayout { get; set; }
+		public long ControllerConfig { get; set; }
 
 		public long SaveData { get; set; }
 		public long IndexOfLoadedStage { get; set; }
diff --git a/src/SHME.ExternalTool/Versions/USRetail.cs b/src/SHME.ExternalTool/Versions/USRetail.cs
index e506ae0..5f270bf 100644
--- a/src/SHME.ExternalTool/Versions/USRetail.cs
+++ b/src/SHME.ExternalTool/Versions/USRetail.cs
@@ -117,7 +117,7 @@ public class USRetail : Rom
 
 				HarryState = 0xBA150,
 
-				ControllerLayout = 0xBC728,
+				ControllerConfig = 0xBC728,
 
 				// 0xBC750 // View control normal/reversed