diff --git a/src/extensions/extension.h b/src/extensions/extension.h
index d9e21894..90a32814 100644
--- a/src/extensions/extension.h
+++ b/src/extensions/extension.h
@@ -197,7 +197,7 @@ HRESULT Extension<T>::Load(IStream *pStm)
     /**
      *  Announce ourself to the swizzle manager.
      */
-    SWIZZLE_HERE_I_AM(id, this);
+    SWIZZLE_REGISTER_POINTER(id, this);
 
     /**
      *  Request the pointer to the base class be remapped.
diff --git a/src/extensions/rules/rulesext.cpp b/src/extensions/rules/rulesext.cpp
index 4aaaa779..872250e0 100644
--- a/src/extensions/rules/rulesext.cpp
+++ b/src/extensions/rules/rulesext.cpp
@@ -116,7 +116,7 @@ HRESULT RulesClassExtension::Load(IStream *pStm)
 
     new (this) RulesClassExtension(NoInitClass());
 
-    SWIZZLE_HERE_I_AM(id, this);
+    SWIZZLE_REGISTER_POINTER(id, this);
 
 #ifndef NDEBUG
     EXT_DEBUG_INFO("RulesExt Load: ID 0x%08X Ptr 0x%08X\n", id, this);
diff --git a/src/extensions/scenario/scenarioext.cpp b/src/extensions/scenario/scenarioext.cpp
index 36d734e5..6ebab7b6 100644
--- a/src/extensions/scenario/scenarioext.cpp
+++ b/src/extensions/scenario/scenarioext.cpp
@@ -112,7 +112,7 @@ HRESULT ScenarioClassExtension::Load(IStream *pStm)
 
     new (this) ScenarioClassExtension(NoInitClass());
 
-    SWIZZLE_HERE_I_AM(id, this);
+    SWIZZLE_REGISTER_POINTER(id, this);
 
 #ifndef NDEBUG
     EXT_DEBUG_INFO("ScenarioExt Load: ID 0x%08X Ptr 0x%08X\n", id, this);
diff --git a/src/extensions/tactical/tacticalext.cpp b/src/extensions/tactical/tacticalext.cpp
index c99c7c50..9337722d 100644
--- a/src/extensions/tactical/tacticalext.cpp
+++ b/src/extensions/tactical/tacticalext.cpp
@@ -139,7 +139,7 @@ HRESULT TacticalMapExtension::Load(IStream *pStm)
 
     new (this) TacticalMapExtension(NoInitClass());
 
-    SWIZZLE_HERE_I_AM(id, this);
+    SWIZZLE_REGISTER_POINTER(id, this);
 
 #ifndef NDEBUG
     EXT_DEBUG_INFO("TacticalExt Load: ID 0x%08X Ptr 0x%08X\n", id, this);