From 73a9013a3be64ca7784c325aa6bc34bc8c3310c1 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:15:56 -0700
Subject: [PATCH] rename GetClassName/IsClass

Mirroring recent changes from master
---
 LEGO1/act1state.h              | 6 +++---
 LEGO1/act3state.h              | 6 +++---
 LEGO1/ambulancemissionstate.h  | 6 +++---
 LEGO1/animstate.h              | 6 +++---
 LEGO1/bumpbouy.cpp             | 4 ++--
 LEGO1/bumpbouy.h               | 4 ++--
 LEGO1/carracestate.h           | 6 +++---
 LEGO1/elevatorbottom.cpp       | 4 ++--
 LEGO1/elevatorbottom.h         | 4 ++--
 LEGO1/gasstationstate.h        | 6 +++---
 LEGO1/helicopter.cpp           | 4 ++--
 LEGO1/helicopter.h             | 4 ++--
 LEGO1/helicopterstate.h        | 6 +++---
 LEGO1/hospitalstate.h          | 6 +++---
 LEGO1/infocenterstate.h        | 6 +++---
 LEGO1/isleactor.cpp            | 4 ++--
 LEGO1/isleactor.h              | 4 ++--
 LEGO1/jetskiracestate.h        | 6 +++---
 LEGO1/jukeboxstate.h           | 6 +++---
 LEGO1/legoact2state.h          | 6 +++---
 LEGO1/legoanimactor.cpp        | 4 ++--
 LEGO1/legoanimactor.h          | 4 ++--
 LEGO1/legocontrolmanager.cpp   | 4 ++--
 LEGO1/legocontrolmanager.h     | 4 ++--
 LEGO1/legoentity.h             | 6 +++---
 LEGO1/legojetski.cpp           | 4 ++--
 LEGO1/legojetski.h             | 4 ++--
 LEGO1/legophonemepresenter.cpp | 2 +-
 LEGO1/legophonemepresenter.h   | 2 +-
 LEGO1/legoplantmanager.cpp     | 2 +-
 LEGO1/legoplantmanager.h       | 2 +-
 LEGO1/legostate.h              | 6 +++---
 LEGO1/mxaudiopresenter.h       | 6 +++---
 LEGO1/mxcompositepresenter.h   | 6 +++---
 LEGO1/mxentity.h               | 6 +++---
 LEGO1/mxmediapresenter.h       | 6 +++---
 LEGO1/mxpresenter.h            | 6 +++---
 LEGO1/mxsoundpresenter.h       | 6 +++---
 LEGO1/mxvideopresenter.h       | 6 +++---
 LEGO1/pizzamissionstate.h      | 6 +++---
 LEGO1/policestate.h            | 6 +++---
 LEGO1/racestate.h              | 6 +++---
 LEGO1/radiostate.h             | 6 +++---
 LEGO1/scorestate.h             | 6 +++---
 LEGO1/towtrackmissionstate.h   | 6 +++---
 45 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/LEGO1/act1state.h b/LEGO1/act1state.h
index 51d46713..c429dbcf 100644
--- a/LEGO1/act1state.h
+++ b/LEGO1/act1state.h
@@ -13,15 +13,15 @@ class Act1State : public LegoState
   Act1State();
 
   // OFFSET: LEGO1 0x100338a0
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   {
     return "Act1State";
   };
 
   // OFFSET: LEGO1 0x100338b0
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, Act1State::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, Act1State::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x18();
diff --git a/LEGO1/act3state.h b/LEGO1/act3state.h
index 771404c9..397644bf 100644
--- a/LEGO1/act3state.h
+++ b/LEGO1/act3state.h
@@ -9,15 +9,15 @@ class Act3State : public LegoState
   Act3State();
 
   // OFFSET: LEGO1 0x1000e300
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     return "Act3State";
   }; 
 
   // OFFSET: LEGO1 0x100d4fd8
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, Act3State::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, Act3State::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14();
diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/ambulancemissionstate.h
index 2b7dd3f3..460558f6 100644
--- a/LEGO1/ambulancemissionstate.h
+++ b/LEGO1/ambulancemissionstate.h
@@ -9,16 +9,16 @@ class AmbulanceMissionState : public LegoState
   AmbulanceMissionState();
 
   // OFFSET: LEGO1 0x10037600
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f00e8
     return "AmbulanceMissionState";
   }; 
 
   // OFFSET: LEGO1 0x10037610
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, AmbulanceMissionState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, AmbulanceMissionState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefined4 param);
diff --git a/LEGO1/animstate.h b/LEGO1/animstate.h
index 029b336e..1eb0c1a7 100644
--- a/LEGO1/animstate.h
+++ b/LEGO1/animstate.h
@@ -10,16 +10,16 @@ class AnimState : public LegoState
   virtual ~AnimState(); // vtable+0x0
 
   // OFFSET: LEGO1 0x10065070
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0460
     return "AnimState";
   }; 
 
   // OFFSET: LEGO1 0x10065080
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, AnimState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, AnimState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x18(); // vtable+0x18
diff --git a/LEGO1/bumpbouy.cpp b/LEGO1/bumpbouy.cpp
index fb213f49..855a18ae 100644
--- a/LEGO1/bumpbouy.cpp
+++ b/LEGO1/bumpbouy.cpp
@@ -4,13 +4,13 @@
 static char* g_bumpBouyString = "BumpBouy";
 
 // OFFSET: LEGO1 0x100274e0 STUB
-const char *BumpBouy::GetClassName() const
+const char *BumpBouy::ClassName() const
 {
   return g_bumpBouyString;
 }
 
 // OFFSET: LEG01 0x10027500 STUB
-MxBool BumpBouy::IsClass(const char *name) const
+MxBool BumpBouy::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/bumpbouy.h b/LEGO1/bumpbouy.h
index 5df4d361..cdeecf05 100644
--- a/LEGO1/bumpbouy.h
+++ b/LEGO1/bumpbouy.h
@@ -6,8 +6,8 @@
 class BumpBouy
 {
 public:
-  virtual const char* GetClassName() const; // vtable+0xc
-  virtual MxBool IsClass(const char *name) const; // vtable+0x10
+  virtual const char* ClassName() const; // vtable+0xc
+  virtual MxBool IsA(const char *name) const; // vtable+0x10
 };
 
 #endif // BUMPBOUY_H
diff --git a/LEGO1/carracestate.h b/LEGO1/carracestate.h
index 6c1ce5a3..3fef2472 100644
--- a/LEGO1/carracestate.h
+++ b/LEGO1/carracestate.h
@@ -7,16 +7,16 @@ class CarRaceState : public RaceState
 {
 public:
   // OFFSET: LEGO1 0x1000dd30
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f009c
     return "CarRaceState";
   }; 
 
   // OFFSET: LEGO1 0x1000dd40
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, CarRaceState::GetClassName()) || RaceState::IsClass(name);
+    return !strcmp(name, CarRaceState::ClassName()) || RaceState::IsA(name);
   };
 };
 
diff --git a/LEGO1/elevatorbottom.cpp b/LEGO1/elevatorbottom.cpp
index c9379ef4..cf8bfa2a 100644
--- a/LEGO1/elevatorbottom.cpp
+++ b/LEGO1/elevatorbottom.cpp
@@ -24,13 +24,13 @@ long ElevatorBottom::Notify(MxParam &p)
 }
 
 // OFFSET: LEGO1 0x10017f20 STUB
-const char *ElevatorBottom::GetClassName() const
+const char *ElevatorBottom::ClassName() const
 {
   return g_elevatorBottomClassName;
 }
 
 // OFFSET: LEGO1 0x10017f30 STUB
-MxBool ElevatorBottom::IsClass(const char *name) const
+MxBool ElevatorBottom::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/elevatorbottom.h b/LEGO1/elevatorbottom.h
index 80508c85..a01df9fc 100644
--- a/LEGO1/elevatorbottom.h
+++ b/LEGO1/elevatorbottom.h
@@ -18,8 +18,8 @@ class ElevatorBottom : public LegoWorld
   virtual ~ElevatorBottom(); // vtable+0x0
 
   virtual long Notify(MxParam &p); // vtable+0x4
-  virtual const char* GetClassName() const; // vtable+0xc
-  virtual MxBool IsClass(const char *name) const; // vtable+0x10
+  virtual const char* ClassName() const; // vtable+0xc
+  virtual MxBool IsA(const char *name) const; // vtable+0x10
 
   virtual undefined4 VTable0x5c(); // vtable+0x5c
   virtual void VTable0x68(undefined1 param_1); // vtable+0x68
diff --git a/LEGO1/gasstationstate.h b/LEGO1/gasstationstate.h
index a27f7208..f19663a6 100644
--- a/LEGO1/gasstationstate.h
+++ b/LEGO1/gasstationstate.h
@@ -9,16 +9,16 @@ class GasStationState : public LegoState
   GasStationState();
 
   // OFFSET: LEGO1 0x100061d0
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0174
     return "GasStationState";
   }; 
 
   // OFFSET: LEGO1 0x100061e0
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, GasStationState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, GasStationState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefined4 param);
diff --git a/LEGO1/helicopter.cpp b/LEGO1/helicopter.cpp
index d1e1e7d6..ce2f6d39 100644
--- a/LEGO1/helicopter.cpp
+++ b/LEGO1/helicopter.cpp
@@ -16,13 +16,13 @@ Helicopter::~Helicopter()
 }
 
 // OFFSET: LEGO1 0x10003070 STUB
-const char *Helicopter::GetClassName() const
+const char *Helicopter::ClassName() const
 {
   return g_helicopterClassName;
 }
 
 // OFFSET: LEGO1 0x10003080 STUB
-MxBool Helicopter::IsClass(const char *name) const
+MxBool Helicopter::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h
index a9619bf6..99a297f7 100644
--- a/LEGO1/helicopter.h
+++ b/LEGO1/helicopter.h
@@ -9,8 +9,8 @@ class Helicopter : public IslePathActor
   Helicopter();
   virtual ~Helicopter(); // vtable+0x0
 
-  virtual const char* GetClassName() const; // vtable+0xc
-  virtual MxBool IsClass(const char *name) const; // vtable+0x10
+  virtual const char* ClassName() const; // vtable+0xc
+  virtual MxBool IsA(const char *name) const; // vtable+0x10
 
   virtual void VTable0x70(float param_1); // vtable+0x70
   virtual void VTable0xe4(); // vtable+0xe4
diff --git a/LEGO1/helicopterstate.h b/LEGO1/helicopterstate.h
index 4e24c088..a973ce20 100644
--- a/LEGO1/helicopterstate.h
+++ b/LEGO1/helicopterstate.h
@@ -7,16 +7,16 @@ class HelicopterState : public LegoState
 {
 public:
   // OFFSET: LEGO1 0x1000e0d0
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0144
     return "HelicopterState";
   }; 
 
   // OFFSET: LEGO1 0x100d5428
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, HelicopterState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, HelicopterState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14();
diff --git a/LEGO1/hospitalstate.h b/LEGO1/hospitalstate.h
index dce6f3b8..1bb600a9 100644
--- a/LEGO1/hospitalstate.h
+++ b/LEGO1/hospitalstate.h
@@ -9,16 +9,16 @@ class HospitalState : public LegoState
   HospitalState();
 
   // OFFSET: LEGO1 0x10076400
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0480
     return "HospitalState";
   }; 
 
   // OFFSET: LEGO1 0x10076410
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, HospitalState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, HospitalState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefined4 param);
diff --git a/LEGO1/infocenterstate.h b/LEGO1/infocenterstate.h
index 4237f2fe..6df6ce0e 100644
--- a/LEGO1/infocenterstate.h
+++ b/LEGO1/infocenterstate.h
@@ -10,16 +10,16 @@ class InfoCenterState : public LegoState
   virtual ~InfoCenterState();
 
   // OFFSET: LEGO1 0x10071840
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f04dc
     return "InfoCenterState";
   }; 
 
   // OFFSET: LEGO1 0x10071850
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, InfoCenterState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, InfoCenterState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14();
diff --git a/LEGO1/isleactor.cpp b/LEGO1/isleactor.cpp
index 37ff6b49..0989364b 100644
--- a/LEGO1/isleactor.cpp
+++ b/LEGO1/isleactor.cpp
@@ -12,13 +12,13 @@ long IsleActor::Notify(MxParam &p)
 }
 
 // OFFSET: LEGO1 0x1000e660 STUB
-const char *IsleActor::GetClassName() const
+const char *IsleActor::ClassName() const
 {
   return g_isleActorClassName;
 }
 
 // OFFSET: LEGO1 0x1000e670 STUB
-MxBool IsleActor::IsClass(const char *name) const
+MxBool IsleActor::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/isleactor.h b/LEGO1/isleactor.h
index 49253426..cbb7776d 100644
--- a/LEGO1/isleactor.h
+++ b/LEGO1/isleactor.h
@@ -7,8 +7,8 @@ class IsleActor : public LegoActor
 {
 public:
   virtual long Notify(MxParam &p); // vtable+0x4
-  virtual const char* GetClassName() const; // vtable+0xc
-  virtual MxBool IsClass(const char *name) const; // vtable+0x10
+  virtual const char* ClassName() const; // vtable+0xc
+  virtual MxBool IsA(const char *name) const; // vtable+0x10
 
   // VTABLE 0x100d5178
 };
diff --git a/LEGO1/jetskiracestate.h b/LEGO1/jetskiracestate.h
index e3df8a0a..ad611cfb 100644
--- a/LEGO1/jetskiracestate.h
+++ b/LEGO1/jetskiracestate.h
@@ -7,16 +7,16 @@ class JetskiRaceState : public RaceState
 {
 public:
   // OFFSET: LEGO1 0x1000dc40
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f00ac
     return "JetskiRaceState";
   }; 
 
   // OFFSET: LEGO1 0x1000dc50
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, JetskiRaceState::GetClassName()) || RaceState::IsClass(name);
+    return !strcmp(name, JetskiRaceState::ClassName()) || RaceState::IsA(name);
   };
 
   // VTABLE 0x100d4fa8
diff --git a/LEGO1/jukeboxstate.h b/LEGO1/jukeboxstate.h
index 3de1413f..b68b6b0a 100644
--- a/LEGO1/jukeboxstate.h
+++ b/LEGO1/jukeboxstate.h
@@ -7,16 +7,16 @@ class JukeBoxState : public LegoState
 {
 public:
   // OFFSET: LEGO1 0x1000f310
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f02bc
     return "JukeBoxState";
   }; 
 
   // OFFSET: LEGO1 0x1000f320
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, JukeBoxState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, JukeBoxState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14();
diff --git a/LEGO1/legoact2state.h b/LEGO1/legoact2state.h
index 3b52206b..2b09da18 100644
--- a/LEGO1/legoact2state.h
+++ b/LEGO1/legoact2state.h
@@ -7,16 +7,16 @@ class LegoAct2State : public LegoState
 {
 public:
   // OFFSET: LEGO1 0x1000df80
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0428
     return "LegoAct2State";
   }; 
 
   // OFFSET: LEGO1 0x1000df90
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, LegoAct2State::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, LegoAct2State::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14();
diff --git a/LEGO1/legoanimactor.cpp b/LEGO1/legoanimactor.cpp
index c67a6e05..640863d0 100644
--- a/LEGO1/legoanimactor.cpp
+++ b/LEGO1/legoanimactor.cpp
@@ -10,13 +10,13 @@ const char* GetClassNameInternal()
 }
 
 // OFFSET: LEGO1 0x1000fb90 STUB
-const char *LegoAnimActor::GetClassName() const
+const char *LegoAnimActor::ClassName() const
 {
   return GetClassNameInternal();
 }
 
 // OFFSET: LEGO1 0x1000fbb0 STUB
-MxBool LegoAnimActor::IsClass(const char *name) const
+MxBool LegoAnimActor::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/legoanimactor.h b/LEGO1/legoanimactor.h
index c2687a81..36024619 100644
--- a/LEGO1/legoanimactor.h
+++ b/LEGO1/legoanimactor.h
@@ -6,8 +6,8 @@
 class LegoAnimActor : public LegoPathActor
 {
 public:
-  virtual const char* GetClassName() const;
-  virtual MxBool IsClass(const char *name) const;
+  virtual const char* ClassName() const;
+  virtual MxBool IsA(const char *name) const;
 
   // VTABLE 0x100d5440
 };
diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/legocontrolmanager.cpp
index 1c1fe467..a7beece5 100644
--- a/LEGO1/legocontrolmanager.cpp
+++ b/LEGO1/legocontrolmanager.cpp
@@ -18,13 +18,13 @@ long LegoControlManager::Tickle()
 }
 
 // OFFSET: LEGO1 0x10028cb0 STUB
-const char *LegoControlManager::GetClassName() const
+const char *LegoControlManager::ClassName() const
 {
   return g_legoControlManagerClassName;
 }
 
 // OFFSET: LEGO1 0x10028cc0 STUB
-MxBool LegoControlManager::IsClass(const char *name) const
+MxBool LegoControlManager::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/legocontrolmanager.h
index 4c226169..9141affe 100644
--- a/LEGO1/legocontrolmanager.h
+++ b/LEGO1/legocontrolmanager.h
@@ -9,8 +9,8 @@ class LegoControlManager : public MxCore
   virtual ~LegoControlManager(); // vtable+0x0
 
   virtual long Tickle(); // vtable+0x8
-  virtual const char* GetClassName() const; // vtable+0xc
-  virtual MxBool IsClass(const char *name) const; // vtable+0x10
+  virtual const char* ClassName() const; // vtable+0xc
+  virtual MxBool IsA(const char *name) const; // vtable+0x10
 
   // VTABLE 0x100d6a80
 };
diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h
index 529ce3ab..7feadace 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/legoentity.h
@@ -16,15 +16,15 @@ class LegoEntity : public MxEntity
   virtual long Notify(MxParam &p); // vtable+0x4
 
   // OFFSET: LEGO1 0x1000c2f0
-  inline const char *LegoEntity::GetClassName() const // vtable+0xc
+  inline const char *LegoEntity::ClassName() const // vtable+0xc
   {
     return "LegoEntity";
   }
 
   // OFFSET: LEGO1 0x1000c300
-  inline MxBool LegoEntity::IsClass(const char *name) const // vtable+0x10
+  inline MxBool LegoEntity::IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, LegoEntity::GetClassName()) || MxEntity::IsClass(name);
+    return !strcmp(name, LegoEntity::ClassName()) || MxEntity::IsA(name);
   }
 
   virtual undefined4 VTable0x18(undefined4 param); // vtable+0x18
diff --git a/LEGO1/legojetski.cpp b/LEGO1/legojetski.cpp
index 048c7080..e98778cc 100644
--- a/LEGO1/legojetski.cpp
+++ b/LEGO1/legojetski.cpp
@@ -4,13 +4,13 @@
 static char* g_legoJetskiClassName = "LegoJetski";
 
 // OFFSET: LEGO1 0x10013e80 STUB
-const char *LegoJetski::GetClassName() const
+const char *LegoJetski::ClassName() const
 {
   return g_legoJetskiClassName;
 }
 
 // OFFSET: LEGO1 0x10013ea0 STUB
-MxBool LegoJetski::IsClass(const char *name) const
+MxBool LegoJetski::IsA(const char *name) const
 {
   // TODO
 
diff --git a/LEGO1/legojetski.h b/LEGO1/legojetski.h
index 8088a396..6adaa089 100644
--- a/LEGO1/legojetski.h
+++ b/LEGO1/legojetski.h
@@ -6,8 +6,8 @@
 class LegoJetski : public LegoJetskiRaceActor
 {
 public:
-  virtual const char* GetClassName() const;
-  virtual MxBool IsClass(const char *name) const;
+  virtual const char* ClassName() const;
+  virtual MxBool IsA(const char *name) const;
 
   // VTABLE 0x100d5a40
 };
diff --git a/LEGO1/legophonemepresenter.cpp b/LEGO1/legophonemepresenter.cpp
index 9c70f0ef..9b7e71a5 100644
--- a/LEGO1/legophonemepresenter.cpp
+++ b/LEGO1/legophonemepresenter.cpp
@@ -10,7 +10,7 @@ LegoPhonemePresenter::~LegoPhonemePresenter()
 }
 
 // OFFSET: LEGO1 0x1004e310 STUB
-const char *LegoPhonemePresenter::GetClassName() const
+const char *LegoPhonemePresenter::ClassName() const
 {
   return g_legoPhonemePresenterClassName;
 }
diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/legophonemepresenter.h
index 04b296ed..a0b25bac 100644
--- a/LEGO1/legophonemepresenter.h
+++ b/LEGO1/legophonemepresenter.h
@@ -8,7 +8,7 @@ class LegoPhonemePresenter : public MxFlcPresenter
 public:
   virtual ~LegoPhonemePresenter(); // vtable+0x0
 
-  virtual const char* GetClassName() const; // vtable+0xc
+  virtual const char* ClassName() const; // vtable+0xc
 
   virtual void VTable0x6c(); // vtable+0x6c
 
diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/legoplantmanager.cpp
index 755b092e..53a4a85a 100644
--- a/LEGO1/legoplantmanager.cpp
+++ b/LEGO1/legoplantmanager.cpp
@@ -24,7 +24,7 @@ long LegoPlantManager::Tickle()
 }
 
 // OFFSET: LEGO1 0x10026290 STUB
-const char *LegoPlantManager::GetClassName() const
+const char *LegoPlantManager::ClassName() const
 {
   return g_LegoPlantManagerName;
 }
diff --git a/LEGO1/legoplantmanager.h b/LEGO1/legoplantmanager.h
index 6dde844b..1ab56265 100644
--- a/LEGO1/legoplantmanager.h
+++ b/LEGO1/legoplantmanager.h
@@ -10,7 +10,7 @@ class LegoPlantManager : public MxCore
   virtual ~LegoPlantManager(); // vtable+0x0
 
   virtual long Tickle(); // vtable+0x8
-  virtual const char* GetClassName() const; // vtable+0xc
+  virtual const char* ClassName() const; // vtable+0xc
 
   void UnknownFunction1(int param_1, int param_2);
 
diff --git a/LEGO1/legostate.h b/LEGO1/legostate.h
index ce779fba..cf8a2fd9 100644
--- a/LEGO1/legostate.h
+++ b/LEGO1/legostate.h
@@ -11,15 +11,15 @@ class LegoState : public MxCore
 {
 public:
   // OFFSET: LEGO1 0x100060d0
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     return "LegoState";
   }; 
 
   // OFFSET: LEGO1 0x100060e0
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, LegoState::GetClassName()) || MxCore::IsClass(name);
+    return !strcmp(name, LegoState::ClassName()) || MxCore::IsA(name);
   };
 
   virtual MxBool VTable0x14(); // vtable+0x14
diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/mxaudiopresenter.h
index 2f900804..fa62db9f 100644
--- a/LEGO1/mxaudiopresenter.h
+++ b/LEGO1/mxaudiopresenter.h
@@ -7,16 +7,16 @@ class MxAudioPresenter : public MxMediaPresenter
 {
 public:
   // OFFSET: LEGO1 0x1000d280
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f078c
     return "MxAudioPresenter";
   }; 
 
   // OFFSET: LEGO1 0x1000d290
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxAudioPresenter::GetClassName()) || MxMediaPresenter::IsClass(name);
+    return !strcmp(name, MxAudioPresenter::ClassName()) || MxMediaPresenter::IsA(name);
   };
 
   virtual undefined4 VTable0x5c(); // vtable+0x5c
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/mxcompositepresenter.h
index 95301196..17dc0b16 100644
--- a/LEGO1/mxcompositepresenter.h
+++ b/LEGO1/mxcompositepresenter.h
@@ -12,16 +12,16 @@ class MxCompositePresenter : public MxPresenter
   virtual long Notify(MxParam &p); // vtable+0x4, MxCore override
 
   // OFFSET: LEGO1 0x100b6210
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0774
     return "MxCompositePresenter";
   }; 
 
   // OFFSET: LEGO1 0x100b6220
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxCompositePresenter::GetClassName()) || MxPresenter::IsClass(name);
+    return !strcmp(name, MxCompositePresenter::ClassName()) || MxPresenter::IsA(name);
   };
 
   virtual long StartAction(MxStreamController *, MxDSAction *); // vtable+0x3c
diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h
index ccabbfe5..bbbedf45 100644
--- a/LEGO1/mxentity.h
+++ b/LEGO1/mxentity.h
@@ -13,16 +13,16 @@ class MxEntity : public MxCore
 {
 public:
   // OFFSET: LEGO1 0x1000c180
-  inline virtual const char* GetClassName() const // vtable+0xc
+  inline virtual const char* ClassName() const // vtable+0xc
   {
     // 0x100f0070
     return "MxEntity";
   };
 
   // OFFSET: LEGO1 0x1000c190
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxEntity::GetClassName()) || MxCore::IsClass(name);
+    return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name);
   };
 
   virtual undefined4 VTable0x14(undefined4 param_1, MxAtomId* param_2); // vtable+0x14
diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/mxmediapresenter.h
index 8b2a8b4a..68bc650e 100644
--- a/LEGO1/mxmediapresenter.h
+++ b/LEGO1/mxmediapresenter.h
@@ -9,16 +9,16 @@ class MxMediaPresenter : public MxPresenter
   virtual long Tickle(); // vtable+0x8, override MxCore
 
   // OFFSET: LEGO1 0x100d4ce4
-  inline virtual const char *MxMediaPresenter::GetClassName() const // vtable+0xc
+  inline virtual const char *MxMediaPresenter::ClassName() const // vtable+0xc
   {
     // 0x100f074c
     return "MxMediaPresenter";
   }
 
   // OFFSET: LEGO1 0x1000c5d0
-  inline virtual MxBool MxMediaPresenter::IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool MxMediaPresenter::IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxMediaPresenter::GetClassName()) || MxPresenter::IsClass(name);
+    return !strcmp(name, MxMediaPresenter::ClassName()) || MxPresenter::IsA(name);
   }
 
   virtual void VTable0x20(); // vtable+0x20, override MxPresenter
diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h
index fe632ca8..d411a186 100644
--- a/LEGO1/mxpresenter.h
+++ b/LEGO1/mxpresenter.h
@@ -22,16 +22,16 @@ class MxPresenter : public MxCore
   __declspec(dllexport) virtual ~MxPresenter(); // vtable+0x0
 
   // OFFSET: LEGO1 0x1000bfe0
-  inline virtual const char *MxPresenter::GetClassName() const // vtable+0xc
+  inline virtual const char *MxPresenter::ClassName() const // vtable+0xc
   {
     // 0x100f0740
     return "MxPresenter";
   }
 
   // OFFSET: LEGO1 0x1000bff0
-  inline virtual MxBool MxPresenter::IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool MxPresenter::IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxPresenter::GetClassName()) || MxCore::IsClass(name);
+    return !strcmp(name, MxPresenter::ClassName()) || MxCore::IsA(name);
   }
 
   __declspec(dllexport) virtual long Tickle(); // vtable+0x8
diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/mxsoundpresenter.h
index d69c699e..491b974d 100644
--- a/LEGO1/mxsoundpresenter.h
+++ b/LEGO1/mxsoundpresenter.h
@@ -7,16 +7,16 @@ class MxSoundPresenter : public MxAudioPresenter
 {
 public:
   // OFFSET: LEGO1 0x1000d4a0
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f07a0
     return "MxSoundPresenter";
   }; 
 
   // OFFSET: LEGO1 0x1000d4b0
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxSoundPresenter::GetClassName()) || MxAudioPresenter::IsClass(name);
+    return !strcmp(name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(name);
   };
 
   virtual undefined4 VTable0x34(); // vtable+0x34
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h
index e217e80c..00597252 100644
--- a/LEGO1/mxvideopresenter.h
+++ b/LEGO1/mxvideopresenter.h
@@ -7,16 +7,16 @@ class MxVideoPresenter : public MxMediaPresenter
 {
 public:
   // OFFSET: LEGO1 0x1000c820
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0760
     return "MxVideoPresenter";
   }; 
 
   // OFFSET: LEGO1 0x1000c830
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, MxVideoPresenter::GetClassName()) || MxMediaPresenter::IsClass(name);
+    return !strcmp(name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(name);
   };
 
   virtual void EndAction(); // vtable+0x40, override MxPresenter
diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/pizzamissionstate.h
index eb273900..94f5d073 100644
--- a/LEGO1/pizzamissionstate.h
+++ b/LEGO1/pizzamissionstate.h
@@ -7,16 +7,16 @@ class PizzaMissionState : public LegoState
 {
 public:
   // OFFSET: LEGO1 0x10039290
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f00d4
     return "PizzaMissionState";
   }; 
 
   // OFFSET: LEGO1 0x100392a0
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, PizzaMissionState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, PizzaMissionState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefinedPtr param);
diff --git a/LEGO1/policestate.h b/LEGO1/policestate.h
index cb213431..f6c82e6e 100644
--- a/LEGO1/policestate.h
+++ b/LEGO1/policestate.h
@@ -9,16 +9,16 @@ class PoliceState : public LegoState
   PoliceState();
 
   // OFFSET: LEGO1 0x1005e860
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0444
     return "PoliceState";
   }; 
 
   // OFFSET: LEGO1 0x1005e870
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, PoliceState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, PoliceState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefined4 param);
diff --git a/LEGO1/racestate.h b/LEGO1/racestate.h
index 14671b3f..431f4962 100644
--- a/LEGO1/racestate.h
+++ b/LEGO1/racestate.h
@@ -9,16 +9,16 @@ class RaceState : public LegoState
   RaceState();
 
   // OFFSET: LEGO1 0x10016010
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f07d0
     return "RaceState";
   }; 
 
   // OFFSET: LEGO1 0x10016020
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, RaceState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, RaceState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefined4 param);
diff --git a/LEGO1/radiostate.h b/LEGO1/radiostate.h
index 1ef628ea..accad489 100644
--- a/LEGO1/radiostate.h
+++ b/LEGO1/radiostate.h
@@ -9,16 +9,16 @@ class RadioState : public LegoState
   RadioState();
 
   // OFFSET: LEGO1 0x1002cf60
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f04f8
     return "RadioState";
   }; 
 
   // OFFSET: LEGO1 0x1002cf70
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, RadioState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, RadioState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14(); // vtable+0x14
diff --git a/LEGO1/scorestate.h b/LEGO1/scorestate.h
index 78218e27..6857f8fa 100644
--- a/LEGO1/scorestate.h
+++ b/LEGO1/scorestate.h
@@ -7,16 +7,16 @@ class ScoreState : public LegoState
 {
 public:
   // OFFSET: LEGO1 0x1000de40
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f0084
     return "ScoreState";
   }; 
 
   // OFFSET: LEGO1 0x1000de50
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, ScoreState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, ScoreState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual MxBool VTable0x14();
diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/towtrackmissionstate.h
index 6c8081aa..403318e8 100644
--- a/LEGO1/towtrackmissionstate.h
+++ b/LEGO1/towtrackmissionstate.h
@@ -9,16 +9,16 @@ class TowTrackMissionState : LegoState
   TowTrackMissionState();
 
   // OFFSET: LEGO1 0x1004dfa0
-  inline virtual const char *GetClassName() const // vtable+0x0c
+  inline virtual const char *ClassName() const // vtable+0x0c
   { 
     // 0x100f00bc
     return "TowTrackMissionState";
   }; 
 
   // OFFSET: LEGO1 0x1004dfb0
-  inline virtual MxBool IsClass(const char *name) const // vtable+0x10
+  inline virtual MxBool IsA(const char *name) const // vtable+0x10
   {
-    return !strcmp(name, TowTrackMissionState::GetClassName()) || LegoState::IsClass(name);
+    return !strcmp(name, TowTrackMissionState::ClassName()) || LegoState::IsA(name);
   };
 
   virtual undefined4 VTable0x1c(undefined4 param); // vtable+0x1c