diff --git a/LEGO1/act1state.h b/LEGO1/act1state.h
index 2724cb84..383b0717 100644
--- a/LEGO1/act1state.h
+++ b/LEGO1/act1state.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d7028
+// VTABLEADDR 0x100d7028
 // SIZE 0x26c
 class Act1State : public LegoState {
 public:
diff --git a/LEGO1/act2brick.h b/LEGO1/act2brick.h
index 573b8330..2bf51ab8 100644
--- a/LEGO1/act2brick.h
+++ b/LEGO1/act2brick.h
@@ -3,7 +3,7 @@
 
 #include "legopathactor.h"
 
-// VTABLE 0x100d9b60
+// VTABLEADDR 0x100d9b60
 // SIZE 0x194
 class Act2Brick : public LegoPathActor {
 public:
diff --git a/LEGO1/act2policestation.h b/LEGO1/act2policestation.h
index 8799db16..152f92fb 100644
--- a/LEGO1/act2policestation.h
+++ b/LEGO1/act2policestation.h
@@ -3,7 +3,7 @@
 
 #include "legoentity.h"
 
-// VTABLE 0x100d53a8
+// VTABLEADDR 0x100d53a8
 // SIZE 0x68
 class Act2PoliceStation : public LegoEntity {
 public:
diff --git a/LEGO1/act3.h b/LEGO1/act3.h
index 7587373f..1d7bd041 100644
--- a/LEGO1/act3.h
+++ b/LEGO1/act3.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d9628
+// VTABLEADDR 0x100d9628
 // SIZE 0x4274
 class Act3 : public LegoWorld {
 public:
diff --git a/LEGO1/act3shark.h b/LEGO1/act3shark.h
index 35d0833f..a053a89d 100644
--- a/LEGO1/act3shark.h
+++ b/LEGO1/act3shark.h
@@ -3,7 +3,7 @@
 
 #include "legoanimactor.h"
 
-// VTABLE 0x100d7920
+// VTABLEADDR 0x100d7920
 class Act3Shark : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x100430c0
diff --git a/LEGO1/act3state.h b/LEGO1/act3state.h
index 72c126e7..e724f2ec 100644
--- a/LEGO1/act3state.h
+++ b/LEGO1/act3state.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d4fc8
+// VTABLEADDR 0x100d4fc8
 // SIZE 0xc
 class Act3State : public LegoState {
 public:
diff --git a/LEGO1/ambulance.h b/LEGO1/ambulance.h
index 1b5272bb..a359c279 100644
--- a/LEGO1/ambulance.h
+++ b/LEGO1/ambulance.h
@@ -3,7 +3,7 @@
 
 #include "islepathactor.h"
 
-// VTABLE 0x100d71a8
+// VTABLEADDR 0x100d71a8
 // SIZE 0x184
 class Ambulance : public IslePathActor {
 public:
diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/ambulancemissionstate.h
index 74bc4fa5..696013a1 100644
--- a/LEGO1/ambulancemissionstate.h
+++ b/LEGO1/ambulancemissionstate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d72a0
+// VTABLEADDR 0x100d72a0
 // SIZE 0x24
 class AmbulanceMissionState : public LegoState {
 public:
diff --git a/LEGO1/animstate.h b/LEGO1/animstate.h
index 2affcffd..90833f79 100644
--- a/LEGO1/animstate.h
+++ b/LEGO1/animstate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d8d80
+// VTABLEADDR 0x100d8d80
 // SIZE 0x1c
 class AnimState : public LegoState {
 public:
diff --git a/LEGO1/beachhouseentity.h b/LEGO1/beachhouseentity.h
index 0c769c51..79049981 100644
--- a/LEGO1/beachhouseentity.h
+++ b/LEGO1/beachhouseentity.h
@@ -3,7 +3,7 @@
 
 #include "buildingentity.h"
 
-// VTABLE 0x100d4a18
+// VTABLEADDR 0x100d4a18
 // SIZE 0x68
 class BeachHouseEntity : public BuildingEntity {
 public:
diff --git a/LEGO1/bike.h b/LEGO1/bike.h
index 2aeed45e..672d7982 100644
--- a/LEGO1/bike.h
+++ b/LEGO1/bike.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d9808
+// VTABLEADDR 0x100d9808
 // SIZE 0x164
 class Bike : public IslePathActor {
 public:
diff --git a/LEGO1/buildingentity.h b/LEGO1/buildingentity.h
index 2f22e5ff..25dd0b6d 100644
--- a/LEGO1/buildingentity.h
+++ b/LEGO1/buildingentity.h
@@ -3,7 +3,7 @@
 
 #include "legoentity.h"
 
-// VTABLE 0x100d5c88
+// VTABLEADDR 0x100d5c88
 // SIZE <= 0x68, hard to tell because it's always constructed as a derivative
 class BuildingEntity : public LegoEntity {
 public:
diff --git a/LEGO1/bumpbouy.h b/LEGO1/bumpbouy.h
index 14b18850..ec9c25db 100644
--- a/LEGO1/bumpbouy.h
+++ b/LEGO1/bumpbouy.h
@@ -4,7 +4,7 @@
 #include "legoanimactor.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d6790
+// VTABLEADDR 0x100d6790
 class BumpBouy : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x100274e0
diff --git a/LEGO1/carrace.h b/LEGO1/carrace.h
index 503b3421..9535c3ef 100644
--- a/LEGO1/carrace.h
+++ b/LEGO1/carrace.h
@@ -3,7 +3,7 @@
 
 #include "legorace.h"
 
-// VTABLE 0x100d5e50
+// VTABLEADDR 0x100d5e50
 // SIZE 0x154
 class CarRace : public LegoRace {
 public:
diff --git a/LEGO1/carracestate.h b/LEGO1/carracestate.h
index 9e1adff4..c185b4f6 100644
--- a/LEGO1/carracestate.h
+++ b/LEGO1/carracestate.h
@@ -3,7 +3,7 @@
 
 #include "racestate.h"
 
-// VTABLE 0x100d4b70
+// VTABLEADDR 0x100d4b70
 // SIZE 0x2c
 class CarRaceState : public RaceState {
 public:
diff --git a/LEGO1/doors.h b/LEGO1/doors.h
index b9346122..400f63fc 100644
--- a/LEGO1/doors.h
+++ b/LEGO1/doors.h
@@ -3,7 +3,7 @@
 
 #include "legopathactor.h"
 
-// VTABLE 0x100d4788
+// VTABLEADDR 0x100d4788
 // SIZE 0x1f8
 class Doors : public LegoPathActor {
 public:
diff --git a/LEGO1/dunebuggy.h b/LEGO1/dunebuggy.h
index 31622497..bb12332f 100644
--- a/LEGO1/dunebuggy.h
+++ b/LEGO1/dunebuggy.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d8f98
+// VTABLEADDR 0x100d8f98
 // SIZE 0x16c
 class DuneBuggy : public IslePathActor {
 public:
diff --git a/LEGO1/elevatorbottom.h b/LEGO1/elevatorbottom.h
index b2ee9016..6b057a99 100644
--- a/LEGO1/elevatorbottom.h
+++ b/LEGO1/elevatorbottom.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d5f20
+// VTABLEADDR 0x100d5f20
 class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
diff --git a/LEGO1/gasstation.h b/LEGO1/gasstation.h
index 15757a6b..acb55b3d 100644
--- a/LEGO1/gasstation.h
+++ b/LEGO1/gasstation.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d4650
+// VTABLEADDR 0x100d4650
 // SIZE 0x128
 // Radio variable at 0x46, in constructor
 class GasStation : public LegoWorld {
diff --git a/LEGO1/gasstationentity.h b/LEGO1/gasstationentity.h
index 8564593a..0cba7924 100644
--- a/LEGO1/gasstationentity.h
+++ b/LEGO1/gasstationentity.h
@@ -3,7 +3,7 @@
 
 #include "buildingentity.h"
 
-// VTABLE 0x100d5258
+// VTABLEADDR 0x100d5258
 // SIZE 0x68
 class GasStationEntity : public BuildingEntity {
 public:
diff --git a/LEGO1/gasstationstate.h b/LEGO1/gasstationstate.h
index f59a8a2f..600e40f1 100644
--- a/LEGO1/gasstationstate.h
+++ b/LEGO1/gasstationstate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d46e0
+// VTABLEADDR 0x100d46e0
 // SIZE 0x24
 class GasStationState : public LegoState {
 public:
diff --git a/LEGO1/gifmanager.h b/LEGO1/gifmanager.h
index 37661abd..674bba8e 100644
--- a/LEGO1/gifmanager.h
+++ b/LEGO1/gifmanager.h
@@ -42,7 +42,7 @@ class GifMap {
 	GifMapEntry* m_unk4;
 };
 
-// VTABLE 0x100d86d4
+// VTABLEADDR 0x100d86d4
 class GifManagerBase {
 public:
 	// OFFSET: LEGO1 0x1005a310 STUB
@@ -56,7 +56,7 @@ class GifManagerBase {
 	GifMap m_unk8;
 };
 
-// VTABLE 0x100d86fc
+// VTABLEADDR 0x100d86fc
 class GifManager : public GifManagerBase {
 public:
 	// OFFSET: LEGO1 0x1005a580 STUB
diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h
index d9de2854..a7238918 100644
--- a/LEGO1/helicopter.h
+++ b/LEGO1/helicopter.h
@@ -5,7 +5,7 @@
 #include "islepathactor.h"
 #include "mxmatrix.h"
 
-// VTABLE 0x100d40f8
+// VTABLEADDR 0x100d40f8
 // SIZE 0x230
 class Helicopter : public IslePathActor {
 public:
diff --git a/LEGO1/helicopterstate.h b/LEGO1/helicopterstate.h
index bd09c90a..d14b98d1 100644
--- a/LEGO1/helicopterstate.h
+++ b/LEGO1/helicopterstate.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "legostate.h"
 
-// VTABLE 0x100d5418
+// VTABLEADDR 0x100d5418
 // SIZE 0xc
 class HelicopterState : public LegoState {
 public:
diff --git a/LEGO1/historybook.h b/LEGO1/historybook.h
index 94cfa53a..3f9a1183 100644
--- a/LEGO1/historybook.h
+++ b/LEGO1/historybook.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100da328
+// VTABLEADDR 0x100da328
 // SIZE 0x3e4
 class HistoryBook : public LegoWorld {
 public:
diff --git a/LEGO1/hospital.h b/LEGO1/hospital.h
index 2a4c9de5..1edcad97 100644
--- a/LEGO1/hospital.h
+++ b/LEGO1/hospital.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d9730
+// VTABLEADDR 0x100d9730
 // SIZE 0x12c
 class Hospital : public LegoWorld {
 public:
diff --git a/LEGO1/hospitalentity.h b/LEGO1/hospitalentity.h
index 15e38426..3b8bc2dd 100644
--- a/LEGO1/hospitalentity.h
+++ b/LEGO1/hospitalentity.h
@@ -3,7 +3,7 @@
 
 #include "buildingentity.h"
 
-// VTABLE 0x100d5068
+// VTABLEADDR 0x100d5068
 // SIZE 0x68
 class HospitalEntity : public BuildingEntity {
 public:
diff --git a/LEGO1/hospitalstate.h b/LEGO1/hospitalstate.h
index db967097..dde4b833 100644
--- a/LEGO1/hospitalstate.h
+++ b/LEGO1/hospitalstate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d97a0
+// VTABLEADDR 0x100d97a0
 // SIZE 0x18
 class HospitalState : public LegoState {
 public:
diff --git a/LEGO1/infocenter.h b/LEGO1/infocenter.h
index a581a1fb..1a8702d9 100644
--- a/LEGO1/infocenter.h
+++ b/LEGO1/infocenter.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d9338
+// VTABLEADDR 0x100d9338
 // SIZE 0x1d8
 class Infocenter : public LegoWorld {
 public:
diff --git a/LEGO1/infocenterdoor.h b/LEGO1/infocenterdoor.h
index b53ff9a2..8a3e8b7b 100644
--- a/LEGO1/infocenterdoor.h
+++ b/LEGO1/infocenterdoor.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d72d8
+// VTABLEADDR 0x100d72d8
 // SIZE 0xfc
 class InfocenterDoor : public LegoWorld {
 public:
diff --git a/LEGO1/infocenterentity.h b/LEGO1/infocenterentity.h
index 384395e6..e4aa1770 100644
--- a/LEGO1/infocenterentity.h
+++ b/LEGO1/infocenterentity.h
@@ -3,7 +3,7 @@
 
 #include "buildingentity.h"
 
-// VTABLE 0x100d4b90
+// VTABLEADDR 0x100d4b90
 // SIZE 0x68
 class InfoCenterEntity : public BuildingEntity {
 public:
diff --git a/LEGO1/infocenterstate.h b/LEGO1/infocenterstate.h
index 84d7b0d3..8e836254 100644
--- a/LEGO1/infocenterstate.h
+++ b/LEGO1/infocenterstate.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "legostate.h"
 
-// VTABLE 0x100d93a8
+// VTABLEADDR 0x100d93a8
 // SIZE 0x94
 class InfocenterState : public LegoState {
 public:
diff --git a/LEGO1/isle.h b/LEGO1/isle.h
index 4b31ae70..8b7bfaf3 100644
--- a/LEGO1/isle.h
+++ b/LEGO1/isle.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d6fb8
+// VTABLEADDR 0x100d6fb8
 // SIZE 0x140
 // Radio at 0x12c
 class Isle : public LegoWorld {
diff --git a/LEGO1/isleactor.h b/LEGO1/isleactor.h
index 5f7fa3f2..5e01afe8 100644
--- a/LEGO1/isleactor.h
+++ b/LEGO1/isleactor.h
@@ -3,7 +3,7 @@
 
 #include "legoactor.h"
 
-// VTABLE 0x100d5178
+// VTABLEADDR 0x100d5178
 class IsleActor : public LegoActor {
 public:
 	// OFFSET: LEGO1 0x1000e660
diff --git a/LEGO1/islepathactor.h b/LEGO1/islepathactor.h
index c0222047..c8b9a2b1 100644
--- a/LEGO1/islepathactor.h
+++ b/LEGO1/islepathactor.h
@@ -5,7 +5,7 @@
 #include "legoworld.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d4398
+// VTABLEADDR 0x100d4398
 // SIZE 0x160
 class IslePathActor : public LegoPathActor {
 public:
diff --git a/LEGO1/jetski.h b/LEGO1/jetski.h
index 2f3d0aa3..1ea9ffb3 100644
--- a/LEGO1/jetski.h
+++ b/LEGO1/jetski.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d9ec8
+// VTABLEADDR 0x100d9ec8
 // SIZE 0x164
 class Jetski : public IslePathActor {
 public:
diff --git a/LEGO1/jetskirace.h b/LEGO1/jetskirace.h
index 7acd68ef..1350f044 100644
--- a/LEGO1/jetskirace.h
+++ b/LEGO1/jetskirace.h
@@ -3,7 +3,7 @@
 
 #include "legorace.h"
 
-// VTABLE 0x100d4fe8
+// VTABLEADDR 0x100d4fe8
 // SIZE 0x144
 class JetskiRace : public LegoRace {
 public:
diff --git a/LEGO1/jetskiracestate.h b/LEGO1/jetskiracestate.h
index 41b2ca84..733e4ace 100644
--- a/LEGO1/jetskiracestate.h
+++ b/LEGO1/jetskiracestate.h
@@ -3,7 +3,7 @@
 
 #include "racestate.h"
 
-// VTABLE 0x100d4fa8
+// VTABLEADDR 0x100d4fa8
 // SIZE 0x2c
 class JetskiRaceState : public RaceState {
 public:
diff --git a/LEGO1/jukebox.h b/LEGO1/jukebox.h
index 941173b4..6e9331c7 100644
--- a/LEGO1/jukebox.h
+++ b/LEGO1/jukebox.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d8958
+// VTABLEADDR 0x100d8958
 // SIZE 0x104
 class JukeBox : public LegoWorld {
 public:
diff --git a/LEGO1/jukeboxentity.h b/LEGO1/jukeboxentity.h
index 1af53195..0b4ac539 100644
--- a/LEGO1/jukeboxentity.h
+++ b/LEGO1/jukeboxentity.h
@@ -3,7 +3,7 @@
 
 #include "legoentity.h"
 
-// VTABLE 0x100da8a0
+// VTABLEADDR 0x100da8a0
 // SIZE 0x6c
 class JukeBoxEntity : public LegoEntity {
 public:
diff --git a/LEGO1/jukeboxstate.h b/LEGO1/jukeboxstate.h
index 99584807..74efe5f9 100644
--- a/LEGO1/jukeboxstate.h
+++ b/LEGO1/jukeboxstate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d4a90
+// VTABLEADDR 0x100d4a90
 // SIZE 0x10
 class JukeBoxState : public LegoState {
 public:
diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego3dwavepresenter.h
index 20679b0e..29ecb23e 100644
--- a/LEGO1/lego3dwavepresenter.h
+++ b/LEGO1/lego3dwavepresenter.h
@@ -3,7 +3,7 @@
 
 #include "legowavepresenter.h"
 
-// VTABLE 0x100d52b0
+// VTABLEADDR 0x100d52b0
 // SIZE 0xa0
 class Lego3DWavePresenter : public LegoWavePresenter {
 public:
diff --git a/LEGO1/legoact2state.h b/LEGO1/legoact2state.h
index 8c4a5b27..4657d5f4 100644
--- a/LEGO1/legoact2state.h
+++ b/LEGO1/legoact2state.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d4a70
+// VTABLEADDR 0x100d4a70
 // SIZE 0x10
 class LegoAct2State : public LegoState {
 public:
diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/legoactioncontrolpresenter.h
index a79098b2..78f312a1 100644
--- a/LEGO1/legoactioncontrolpresenter.h
+++ b/LEGO1/legoactioncontrolpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100d5118
+// VTABLEADDR 0x100d5118
 // SIZE 0x68
 class LegoActionControlPresenter : public MxMediaPresenter {
 public:
diff --git a/LEGO1/legoactor.h b/LEGO1/legoactor.h
index 4c943cf6..3c4ed06e 100644
--- a/LEGO1/legoactor.h
+++ b/LEGO1/legoactor.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "legoentity.h"
 
-// VTABLE 0x100d6d68
+// VTABLEADDR 0x100d6d68
 // SIZE 0x78
 class LegoActor : public LegoEntity {
 public:
diff --git a/LEGO1/legoactorpresenter.h b/LEGO1/legoactorpresenter.h
index a4646cc4..4678dcbd 100644
--- a/LEGO1/legoactorpresenter.h
+++ b/LEGO1/legoactorpresenter.h
@@ -3,7 +3,7 @@
 
 #include "legoentitypresenter.h"
 
-// VTABLE 0x100d5320
+// VTABLEADDR 0x100d5320
 // SIZE 0x50
 class LegoActorPresenter : public LegoEntityPresenter {
 public:
diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/legoanimationmanager.h
index a99544eb..4d0aa6a5 100644
--- a/LEGO1/legoanimationmanager.h
+++ b/LEGO1/legoanimationmanager.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d8c18
+// VTABLEADDR 0x100d8c18
 // SIZE 0x500
 class LegoAnimationManager : public MxCore {
 public:
diff --git a/LEGO1/legoanimmmpresenter.h b/LEGO1/legoanimmmpresenter.h
index b596ccc6..1d5ad007 100644
--- a/LEGO1/legoanimmmpresenter.h
+++ b/LEGO1/legoanimmmpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxcompositepresenter.h"
 
-// VTABLE 0x100d7de8
+// VTABLEADDR 0x100d7de8
 // SIZE 0x74
 class LegoAnimMMPresenter : public MxCompositePresenter {
 public:
diff --git a/LEGO1/legoanimpresenter.h b/LEGO1/legoanimpresenter.h
index 4599be12..6082fc06 100644
--- a/LEGO1/legoanimpresenter.h
+++ b/LEGO1/legoanimpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxvideopresenter.h"
 
-// VTABLE 0x100d90c8
+// VTABLEADDR 0x100d90c8
 class LegoAnimPresenter : public MxVideoPresenter {
 public:
 	LegoAnimPresenter();
diff --git a/LEGO1/legobackgroundcolor.h b/LEGO1/legobackgroundcolor.h
index 26143be2..045ea05c 100644
--- a/LEGO1/legobackgroundcolor.h
+++ b/LEGO1/legobackgroundcolor.h
@@ -3,7 +3,7 @@
 
 #include "mxvariable.h"
 
-// VTABLE 0x100d74a8
+// VTABLEADDR 0x100d74a8
 // SIZE 0x30
 class LegoBackgroundColor : public MxVariable {
 public:
diff --git a/LEGO1/legobuildingmanager.h b/LEGO1/legobuildingmanager.h
index e2662bd4..10e495eb 100644
--- a/LEGO1/legobuildingmanager.h
+++ b/LEGO1/legobuildingmanager.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d6f50
+// VTABLEADDR 0x100d6f50
 // SIZE 0x30
 class LegoBuildingManager : public MxCore {
 public:
diff --git a/LEGO1/legocachesound.h b/LEGO1/legocachesound.h
index 1292d1b2..39092690 100644
--- a/LEGO1/legocachesound.h
+++ b/LEGO1/legocachesound.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d4718
+// VTABLEADDR 0x100d4718
 // SIZE 0x88
 class LegoCacheSound : public MxCore {
 public:
diff --git a/LEGO1/legocameracontroller.h b/LEGO1/legocameracontroller.h
index a1249b5c..a695faa1 100644
--- a/LEGO1/legocameracontroller.h
+++ b/LEGO1/legocameracontroller.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d57b0
+// VTABLEADDR 0x100d57b0
 // SIZE 0xc8
 class LegoCameraController : public MxCore {
 public:
diff --git a/LEGO1/legocarbuild.h b/LEGO1/legocarbuild.h
index cb8d7e6f..57799412 100644
--- a/LEGO1/legocarbuild.h
+++ b/LEGO1/legocarbuild.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d6658
+// VTABLEADDR 0x100d6658
 // SIZE 0x34c
 class LegoCarBuild : public LegoWorld {
 public:
diff --git a/LEGO1/legocarbuildanimpresenter.h b/LEGO1/legocarbuildanimpresenter.h
index a0a9bf70..9f42fe98 100644
--- a/LEGO1/legocarbuildanimpresenter.h
+++ b/LEGO1/legocarbuildanimpresenter.h
@@ -3,7 +3,7 @@
 
 #include "legoanimpresenter.h"
 
-// VTABLE 0x100d99e0
+// VTABLEADDR 0x100d99e0
 // SIZE 0x150
 class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 public:
diff --git a/LEGO1/legocarraceactor.h b/LEGO1/legocarraceactor.h
index b74a070f..d381edff 100644
--- a/LEGO1/legocarraceactor.h
+++ b/LEGO1/legocarraceactor.h
@@ -3,7 +3,7 @@
 
 #include "legoraceactor.h"
 
-// VTABLE 0x100da0d8
+// VTABLEADDR 0x100da0d8
 class LegoCarRaceActor : public LegoRaceActor {
 public:
 	// OFFSET: LEGO1 0x10081650
diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/legocontrolmanager.h
index 1c060c24..1e40425e 100644
--- a/LEGO1/legocontrolmanager.h
+++ b/LEGO1/legocontrolmanager.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d6a80
+// VTABLEADDR 0x100d6a80
 class LegoControlManager : public MxCore {
 public:
 	LegoControlManager();
diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h
index 1da99f3b..f9345d89 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/legoentity.h
@@ -8,7 +8,7 @@
 #include "mxentity.h"
 #include "mxvector.h"
 
-// VTABLE 0x100d4858
+// VTABLEADDR 0x100d4858
 // SIZE 0x68 (probably)
 class LegoEntity : public MxEntity {
 public:
diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/legoentitypresenter.h
index 30360919..34644e50 100644
--- a/LEGO1/legoentitypresenter.h
+++ b/LEGO1/legoentitypresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxcompositepresenter.h"
 
-// VTABLE 0x100d8398
+// VTABLEADDR 0x100d8398
 class LegoEntityPresenter : public MxCompositePresenter {
 public:
 	LegoEntityPresenter();
diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/legoeventnotificationparam.h
index f53fb822..8e1253b8 100644
--- a/LEGO1/legoeventnotificationparam.h
+++ b/LEGO1/legoeventnotificationparam.h
@@ -4,7 +4,7 @@
 #include "mxnotificationparam.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d6aa0
+// VTABLEADDR 0x100d6aa0
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
 	inline LegoEventNotificationParam() : MxNotificationParam((MxParamType) 0, NULL) {}
diff --git a/LEGO1/legoextraactor.h b/LEGO1/legoextraactor.h
index 63b124cf..2ad18e2f 100644
--- a/LEGO1/legoextraactor.h
+++ b/LEGO1/legoextraactor.h
@@ -3,7 +3,7 @@
 
 #include "legoanimactor.h"
 
-// VTABLE 0x100d6c10
+// VTABLEADDR 0x100d6c10
 class LegoExtraActor : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x1002b7a0
diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/legoflctexturepresenter.h
index 9d8c2bfd..f224346b 100644
--- a/LEGO1/legoflctexturepresenter.h
+++ b/LEGO1/legoflctexturepresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxflcpresenter.h"
 
-// VTABLE 0x100d89e0
+// VTABLEADDR 0x100d89e0
 // SIZE 0x70
 class LegoFlcTexturePresenter : public MxFlcPresenter {
 public:
diff --git a/LEGO1/legofullscreenmovie.h b/LEGO1/legofullscreenmovie.h
index 443d45ab..06d66f3f 100644
--- a/LEGO1/legofullscreenmovie.h
+++ b/LEGO1/legofullscreenmovie.h
@@ -3,7 +3,7 @@
 
 #include "mxvariable.h"
 
-// VTABLE 0x100d74b8
+// VTABLEADDR 0x100d74b8
 // SIZE 0x24
 class LegoFullScreenMovie : public MxVariable {
 public:
diff --git a/LEGO1/legohideanimpresenter.h b/LEGO1/legohideanimpresenter.h
index e2720a33..3e0c755f 100644
--- a/LEGO1/legohideanimpresenter.h
+++ b/LEGO1/legohideanimpresenter.h
@@ -3,7 +3,7 @@
 
 #include "legoloopinganimpresenter.h"
 
-// VTABLE 0x100d9278
+// VTABLEADDR 0x100d9278
 // SIZE 0xc4
 class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 public:
diff --git a/LEGO1/legoinputmanager.h b/LEGO1/legoinputmanager.h
index d0059605..163dbb70 100644
--- a/LEGO1/legoinputmanager.h
+++ b/LEGO1/legoinputmanager.h
@@ -22,7 +22,7 @@ class LegoControlManager;
 // TODO Really a MxQueue, but we don't have one of those
 class LegoEventQueue : public MxList<LegoEventNotificationParam> {};
 
-// VTABLE 0x100d8760
+// VTABLEADDR 0x100d8760
 // SIZE 0x338
 class LegoInputManager : public MxPresenter {
 public:
diff --git a/LEGO1/legojetski.h b/LEGO1/legojetski.h
index 4f6ce941..302ef469 100644
--- a/LEGO1/legojetski.h
+++ b/LEGO1/legojetski.h
@@ -3,7 +3,7 @@
 
 #include "legojetskiraceactor.h"
 
-// VTABLE 0x100d5a40
+// VTABLEADDR 0x100d5a40
 class LegoJetski : public LegoJetskiRaceActor {
 public:
 	// OFFSET: LEGO1 0x10013e80
diff --git a/LEGO1/legojetskiraceactor.h b/LEGO1/legojetskiraceactor.h
index 7ec6256b..eaf0b4b0 100644
--- a/LEGO1/legojetskiraceactor.h
+++ b/LEGO1/legojetskiraceactor.h
@@ -3,7 +3,7 @@
 
 #include "legocarraceactor.h"
 
-// VTABLE 0x100da240
+// VTABLEADDR 0x100da240
 class LegoJetskiRaceActor : public LegoCarRaceActor {
 public:
 	// OFFSET: LEGO1 0x10081d80
diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/legoloadcachesoundpresenter.h
index b765ec2d..1afdb12a 100644
--- a/LEGO1/legoloadcachesoundpresenter.h
+++ b/LEGO1/legoloadcachesoundpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxwavepresenter.h"
 
-// VTABLE 0x100d5fa8
+// VTABLEADDR 0x100d5fa8
 // SIZE 0x90
 class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 public:
diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/legolocomotionanimpresenter.h
index 93c84794..926292a0 100644
--- a/LEGO1/legolocomotionanimpresenter.h
+++ b/LEGO1/legolocomotionanimpresenter.h
@@ -3,7 +3,7 @@
 
 #include "legoloopinganimpresenter.h"
 
-// VTABLE 0x100d9170
+// VTABLEADDR 0x100d9170
 class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoLocomotionAnimPresenter();
diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/legoloopinganimpresenter.h
index 5cb431c2..419e5134 100644
--- a/LEGO1/legoloopinganimpresenter.h
+++ b/LEGO1/legoloopinganimpresenter.h
@@ -3,7 +3,7 @@
 
 #include "legoanimpresenter.h"
 
-// VTABLE 0x100d4900
+// VTABLEADDR 0x100d4900
 // SIZE 0xc0 (discovered through inlined constructor at 0x10009ecd)
 class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 public:
diff --git a/LEGO1/legometerpresenter.h b/LEGO1/legometerpresenter.h
index 2803003b..20eb960a 100644
--- a/LEGO1/legometerpresenter.h
+++ b/LEGO1/legometerpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxstillpresenter.h"
 
-// VTABLE 0x100d7ac8
+// VTABLEADDR 0x100d7ac8
 // SIZE 0x94 (from 0x1000a163)
 class LegoMeterPresenter : public MxStillPresenter {
 public:
diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/legomodelpresenter.h
index 1d36e015..38fa89e6 100644
--- a/LEGO1/legomodelpresenter.h
+++ b/LEGO1/legomodelpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxvideopresenter.h"
 
-// VTABLE 0x100d4e50
+// VTABLEADDR 0x100d4e50
 // SIZE 0x6c (discovered through inline constructor at 0x10009ae6)
 class LegoModelPresenter : public MxVideoPresenter {
 public:
diff --git a/LEGO1/legonavcontroller.h b/LEGO1/legonavcontroller.h
index 65b9f5ab..d567f39c 100644
--- a/LEGO1/legonavcontroller.h
+++ b/LEGO1/legonavcontroller.h
@@ -5,7 +5,7 @@
 #include "mxtimer.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d85b8
+// VTABLEADDR 0x100d85b8
 // SIZE 0x70
 class LegoNavController : public MxCore {
 public:
diff --git a/LEGO1/legoobjectfactory.h b/LEGO1/legoobjectfactory.h
index 45d1a747..38f03204 100644
--- a/LEGO1/legoobjectfactory.h
+++ b/LEGO1/legoobjectfactory.h
@@ -5,7 +5,7 @@
 
 #define FOR_LEGOOBJECTFACTORY_OBJECTS(X) X(InfocenterState)
 
-// VTABLE 0x100d4768
+// VTABLEADDR 0x100d4768
 class LegoObjectFactory : public MxObjectFactory {
 public:
 	LegoObjectFactory();
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index b8b9c1d5..dbf5fd92 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -26,7 +26,7 @@ class MxBackgroundAudioManager;
 class MxDSFile;
 class MxTransitionManager;
 
-// VTABLE 0x100d8638
+// VTABLEADDR 0x100d8638
 // SIZE: 0x140
 class LegoOmni : public MxOmni {
 public:
diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/legopalettepresenter.h
index 7688d0af..faefd37b 100644
--- a/LEGO1/legopalettepresenter.h
+++ b/LEGO1/legopalettepresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxvideopresenter.h"
 
-// VTABLE 0x100d9aa0
+// VTABLEADDR 0x100d9aa0
 // SIZE 0x68
 class LegoPalettePresenter : public MxVideoPresenter {
 public:
diff --git a/LEGO1/legopartpresenter.h b/LEGO1/legopartpresenter.h
index baee2dfd..c7929b9b 100644
--- a/LEGO1/legopartpresenter.h
+++ b/LEGO1/legopartpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100d4df0
+// VTABLEADDR 0x100d4df0
 // SIZE 0x54 (from inlined construction at 0x10009fac)
 class LegoPartPresenter : public MxMediaPresenter {
 public:
diff --git a/LEGO1/legopathactor.h b/LEGO1/legopathactor.h
index df6f30af..71e7b334 100644
--- a/LEGO1/legopathactor.h
+++ b/LEGO1/legopathactor.h
@@ -4,7 +4,7 @@
 #include "legoactor.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d6e28
+// VTABLEADDR 0x100d6e28
 // SIZE 0x154 (from inlined construction at 0x1000a346)
 class LegoPathActor : public LegoActor {
 public:
diff --git a/LEGO1/legopathcontroller.h b/LEGO1/legopathcontroller.h
index 82ac1fe9..d40be802 100644
--- a/LEGO1/legopathcontroller.h
+++ b/LEGO1/legopathcontroller.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d7d60
+// VTABLEADDR 0x100d7d60
 // SIZE 0x40
 class LegoPathController : public MxCore {
 public:
diff --git a/LEGO1/legopathpresenter.h b/LEGO1/legopathpresenter.h
index 8e4881fb..12130c60 100644
--- a/LEGO1/legopathpresenter.h
+++ b/LEGO1/legopathpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100d7c10
+// VTABLEADDR 0x100d7c10
 // SIZE 0x54
 class LegoPathPresenter : public MxMediaPresenter {
 public:
diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/legophonemepresenter.h
index 2e784ed7..20a8be35 100644
--- a/LEGO1/legophonemepresenter.h
+++ b/LEGO1/legophonemepresenter.h
@@ -6,7 +6,7 @@
 #include "mxstring.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d8040
+// VTABLEADDR 0x100d8040
 // SIZE 0x88
 class LegoPhonemePresenter : public MxFlcPresenter {
 public:
diff --git a/LEGO1/legoplantmanager.h b/LEGO1/legoplantmanager.h
index 087a0f6e..28f588c6 100644
--- a/LEGO1/legoplantmanager.h
+++ b/LEGO1/legoplantmanager.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d6758
+// VTABLEADDR 0x100d6758
 // SIZE 0x2c
 class LegoPlantManager : public MxCore {
 public:
diff --git a/LEGO1/legorace.h b/LEGO1/legorace.h
index 73a4c6f4..c8284295 100644
--- a/LEGO1/legorace.h
+++ b/LEGO1/legorace.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d5db0
+// VTABLEADDR 0x100d5db0
 class LegoRace : public LegoWorld {
 public:
 	LegoRace();
diff --git a/LEGO1/legoraceactor.h b/LEGO1/legoraceactor.h
index 9df0e9a1..481cca6a 100644
--- a/LEGO1/legoraceactor.h
+++ b/LEGO1/legoraceactor.h
@@ -3,7 +3,7 @@
 
 #include "legoanimactor.h"
 
-// VTABLE 0x100d5b88
+// VTABLEADDR 0x100d5b88
 class LegoRaceActor : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x10014af0
diff --git a/LEGO1/legosoundmanager.h b/LEGO1/legosoundmanager.h
index b9bcacbe..a61fd96f 100644
--- a/LEGO1/legosoundmanager.h
+++ b/LEGO1/legosoundmanager.h
@@ -3,7 +3,7 @@
 
 #include "mxsoundmanager.h"
 
-// VTABLE 0x100d6b10
+// VTABLEADDR 0x100d6b10
 // SIZE 0x44
 class LegoSoundManager : public MxSoundManager {
 public:
diff --git a/LEGO1/legostate.h b/LEGO1/legostate.h
index b0d726b9..c7670262 100644
--- a/LEGO1/legostate.h
+++ b/LEGO1/legostate.h
@@ -6,7 +6,7 @@
 #include "mxcore.h"
 #include "mxstring.h"
 
-// VTABLE 0x100d46c0
+// VTABLEADDR 0x100d46c0
 class LegoState : public MxCore {
 public:
 	virtual ~LegoState() override; // vtable+0x00
diff --git a/LEGO1/legostream.h b/LEGO1/legostream.h
index 719f3b44..56040cb2 100644
--- a/LEGO1/legostream.h
+++ b/LEGO1/legostream.h
@@ -13,7 +13,7 @@
 
 class MxVariableTable;
 
-// VTABLE 0x100d7d80
+// VTABLEADDR 0x100d7d80
 class LegoStream {
 public:
 	LegoStream() : m_mode(0) {}
@@ -40,7 +40,7 @@ class LegoStream {
 	MxU8 m_mode;
 };
 
-// VTABLE 0x100db730
+// VTABLEADDR 0x100db730
 class LegoFileStream : public LegoStream {
 public:
 	LegoFileStream();
@@ -59,7 +59,7 @@ class LegoFileStream : public LegoStream {
 	FILE* m_hFile;
 };
 
-// VTABLE 0x100db710
+// VTABLEADDR 0x100db710
 class LegoMemoryStream : public LegoStream {
 public:
 	LegoMemoryStream(char* p_buffer);
diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/legotexturepresenter.h
index 50d6f86c..6d751b2a 100644
--- a/LEGO1/legotexturepresenter.h
+++ b/LEGO1/legotexturepresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100d4d90
+// VTABLEADDR 0x100d4d90
 // SIZE 0x54 (from inlined construction at 0x10009bb5)
 class LegoTexturePresenter : public MxMediaPresenter {
 public:
diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/legovehiclebuildstate.h
index 8fe8e03d..7432a3d8 100644
--- a/LEGO1/legovehiclebuildstate.h
+++ b/LEGO1/legovehiclebuildstate.h
@@ -5,7 +5,7 @@
 #include "legostate.h"
 #include "mxstring.h"
 
-// VTABLE 0x100d66e0
+// VTABLEADDR 0x100d66e0
 // SIZE 0x50 (from 1000acd7)
 class LegoVehicleBuildState : public LegoState {
 public:
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index b845e8a8..e7a53b7a 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -8,7 +8,7 @@
 
 #include <ddraw.h>
 
-// VTABLE 0x100d9c88
+// VTABLEADDR 0x100d9c88
 // SIZE 0x590
 class LegoVideoManager : public MxVideoManager {
 public:
diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h
index b2ad8793..32a7ac35 100644
--- a/LEGO1/legoworld.h
+++ b/LEGO1/legoworld.h
@@ -5,7 +5,7 @@
 #include "legoentity.h"
 #include "mxpresenter.h"
 
-// VTABLE 0x100d6280
+// VTABLEADDR 0x100d6280
 // SIZE 0xf8
 class LegoWorld : public LegoEntity {
 public:
diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/legoworldpresenter.h
index 284c0437..3ff701de 100644
--- a/LEGO1/legoworldpresenter.h
+++ b/LEGO1/legoworldpresenter.h
@@ -3,7 +3,7 @@
 
 #include "legoentitypresenter.h"
 
-// VTABLE 0x100d8ee0
+// VTABLEADDR 0x100d8ee0
 // SIZE 0x54
 class LegoWorldPresenter : public LegoEntityPresenter {
 public:
diff --git a/LEGO1/motorcycle.h b/LEGO1/motorcycle.h
index b53fc48e..2356c898 100644
--- a/LEGO1/motorcycle.h
+++ b/LEGO1/motorcycle.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d7090
+// VTABLEADDR 0x100d7090
 // SIZE 0x16c
 class Motorcycle : public IslePathActor {
 public:
diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/mxactionnotificationparam.h
index 3255f91d..fcf54f6a 100644
--- a/LEGO1/mxactionnotificationparam.h
+++ b/LEGO1/mxactionnotificationparam.h
@@ -4,7 +4,7 @@
 #include "mxdsaction.h"
 #include "mxnotificationparam.h"
 
-// VTABLE 0x100d8350
+// VTABLEADDR 0x100d8350
 // SIZE 0x14
 class MxActionNotificationParam : public MxNotificationParam {
 public:
@@ -45,7 +45,7 @@ class MxActionNotificationParam : public MxNotificationParam {
 	MxBool m_realloc;     // 0x10
 };
 
-// VTABLE 0x100d8358
+// VTABLEADDR 0x100d8358
 // SIZE 0x14
 class MxEndActionNotificationParam : public MxActionNotificationParam {
 public:
diff --git a/LEGO1/mxaudiomanager.h b/LEGO1/mxaudiomanager.h
index 4412d9e7..3e971db2 100644
--- a/LEGO1/mxaudiomanager.h
+++ b/LEGO1/mxaudiomanager.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxmediamanager.h"
 
-// VTABLE 0x100dc6e0
+// VTABLEADDR 0x100dc6e0
 class MxAudioManager : public MxMediaManager {
 public:
 	MxAudioManager();
diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/mxaudiopresenter.h
index 717c8b4d..1340b073 100644
--- a/LEGO1/mxaudiopresenter.h
+++ b/LEGO1/mxaudiopresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100d4c70
+// VTABLEADDR 0x100d4c70
 class MxAudioPresenter : public MxMediaPresenter {
 public:
 	MxAudioPresenter() { m_unk50 = 100; }
diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/mxbackgroundaudiomanager.h
index a306ef2a..13458072 100644
--- a/LEGO1/mxbackgroundaudiomanager.h
+++ b/LEGO1/mxbackgroundaudiomanager.h
@@ -6,7 +6,7 @@
 #include "mxnotificationmanager.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d9fe8
+// VTABLEADDR 0x100d9fe8
 // SIZE 0x150
 class MxBackgroundAudioManager : public MxCore {
 public:
diff --git a/LEGO1/mxbitmap.h b/LEGO1/mxbitmap.h
index e0a8dffc..a21d5826 100644
--- a/LEGO1/mxbitmap.h
+++ b/LEGO1/mxbitmap.h
@@ -29,7 +29,7 @@ struct MxBITMAPINFO {
 #define BI_RGB_TOPDOWN 0x10
 
 // SIZE 0x20
-// VTABLE 0x100dc7b0
+// VTABLEADDR 0x100dc7b0
 class MxBitmap : public MxCore {
 public:
 	__declspec(dllexport) MxBitmap();
diff --git a/LEGO1/mxcompositemediapresenter.h b/LEGO1/mxcompositemediapresenter.h
index f651fe5b..c580ab64 100644
--- a/LEGO1/mxcompositemediapresenter.h
+++ b/LEGO1/mxcompositemediapresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxcompositepresenter.h"
 
-// VTABLE 0x100dc618
+// VTABLEADDR 0x100dc618
 // SIZE 0x50
 class MxCompositeMediaPresenter : public MxCompositePresenter {
 public:
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/mxcompositepresenter.h
index f7fbd1cf..fbd23893 100644
--- a/LEGO1/mxcompositepresenter.h
+++ b/LEGO1/mxcompositepresenter.h
@@ -4,7 +4,7 @@
 #include "mxpresenter.h"
 #include "mxunklist.h"
 
-// VTABLE 0x100dc618
+// VTABLEADDR 0x100dc618
 // SIZE 0x4c
 class MxCompositePresenter : public MxPresenter {
 public:
diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/mxcontrolpresenter.h
index 29a7121a..7e903ef6 100644
--- a/LEGO1/mxcontrolpresenter.h
+++ b/LEGO1/mxcontrolpresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxcompositepresenter.h"
 
-// VTABLE 0x100d7b88
+// VTABLEADDR 0x100d7b88
 // SIZE 0x5c
 class MxControlPresenter : public MxCompositePresenter {
 public:
diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h
index 1ca8a906..27d5f26b 100644
--- a/LEGO1/mxcore.h
+++ b/LEGO1/mxcore.h
@@ -8,14 +8,20 @@
 
 class MxParam;
 
-// VTABLE 0x100dc0f8
+// VTABLEADDR 0x100dc0f8
 // SIZE 0x8
 class MxCore {
 public:
 	__declspec(dllexport) MxCore();
-	__declspec(dllexport) virtual ~MxCore();                   // vtable+00
-	__declspec(dllexport) virtual MxResult Notify(MxParam& p); // vtable+04
-	virtual MxResult Tickle();                                 // vtable+08
+
+	// VTABLE 0x0
+	__declspec(dllexport) virtual ~MxCore();
+
+	// VTABLE 0x4
+	__declspec(dllexport) virtual MxResult Notify(MxParam& p);
+
+	// VTABLE 0x8
+	virtual MxResult Tickle();
 
 	// OFFSET: LEGO1 0x100144c0
 	inline virtual const char* ClassName() const // vtable+0c
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 97821ab0..cebb0a0b 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -17,7 +17,7 @@ class MxDeviceModeFinder {
 	MxDirectDraw::DeviceModesInfo* m_deviceInfo; // +0xe0
 };
 
-// VTABLE 0x100db814 (or 0x100d9cc8?)
+// VTABLEADDR 0x100db814 (or 0x100d9cc8?)
 // SIZE 0x198
 class MxDeviceEnumerate {
 public:
@@ -35,7 +35,7 @@ class MxDeviceEnumerate {
 	undefined4 m_unknown[97];
 };
 
-// VTABLE 0x100db800
+// VTABLEADDR 0x100db800
 // SIZE 0x894
 class MxDirect3D : public MxDirectDraw {
 public:
diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h
index 8a879a70..e6856df1 100644
--- a/LEGO1/mxdirectdraw.h
+++ b/LEGO1/mxdirectdraw.h
@@ -6,7 +6,7 @@
 
 extern BOOL g_is_PALETTEINDEXED8;
 
-// VTABLE 0x100db818
+// VTABLEADDR 0x100db818
 // SIZE 0x880
 class MxDirectDraw {
 public:
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index cf2582dc..bef11cf5 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -6,7 +6,7 @@
 
 #include <string.h>
 
-// VTABLE 0x100dccb8
+// VTABLEADDR 0x100dccb8
 // SIZE 0xc8
 class MxDiskStreamController : public MxStreamController {
 public:
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h
index 9cfa708c..e343fa93 100644
--- a/LEGO1/mxdiskstreamprovider.h
+++ b/LEGO1/mxdiskstreamprovider.h
@@ -9,7 +9,7 @@
 
 class MxDiskStreamProvider;
 
-// VTABLE 0x100dd130
+// VTABLEADDR 0x100dd130
 class MxDiskStreamProviderThread : public MxThread {
 public:
 	// Only inlined, no offset
@@ -21,7 +21,7 @@ class MxDiskStreamProviderThread : public MxThread {
 	MxDiskStreamProvider* m_target;
 };
 
-// VTABLE 0x100dd138
+// VTABLEADDR 0x100dd138
 class MxDiskStreamProvider : public MxStreamProvider {
 public:
 	MxDiskStreamProvider();
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index 5445f523..9c78cb1c 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -9,7 +9,7 @@
 
 #include <ddraw.h>
 
-// VTABLE 0x100dc768
+// VTABLEADDR 0x100dc768
 // SIZE 0xac
 class MxDisplaySurface : public MxCore {
 public:
diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h
index 72d7afac..0c2a9982 100644
--- a/LEGO1/mxdsaction.h
+++ b/LEGO1/mxdsaction.h
@@ -7,7 +7,7 @@
 
 class MxOmni;
 
-// VTABLE 0x100dc098
+// VTABLEADDR 0x100dc098
 // SIZE 0x94
 class MxDSAction : public MxDSObject {
 public:
diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/mxdsactionlist.h
index 3dc9798a..73116cfe 100644
--- a/LEGO1/mxdsactionlist.h
+++ b/LEGO1/mxdsactionlist.h
@@ -6,7 +6,7 @@
 
 class MxDSAction;
 
-// VTABLE 0x100dced8
+// VTABLEADDR 0x100dced8
 // SIZE 0x1c
 class MxDSActionList : public MxList<MxDSAction*> {
 public:
diff --git a/LEGO1/mxdsanim.h b/LEGO1/mxdsanim.h
index a78b9874..ff10ce62 100644
--- a/LEGO1/mxdsanim.h
+++ b/LEGO1/mxdsanim.h
@@ -3,7 +3,7 @@
 
 #include "mxdsmediaaction.h"
 
-// VTABLE 0x100dcd88
+// VTABLEADDR 0x100dcd88
 // SIZE 0xb8
 class MxDSAnim : public MxDSMediaAction {
 public:
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h
index e521b47f..ceb72c0c 100644
--- a/LEGO1/mxdsbuffer.h
+++ b/LEGO1/mxdsbuffer.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxcore.h"
 
-// VTABLE 0x100dcca0
+// VTABLEADDR 0x100dcca0
 // SIZE 0x34
 class MxDSBuffer : public MxCore {
 public:
diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h
index ba716de6..d75b0da3 100644
--- a/LEGO1/mxdschunk.h
+++ b/LEGO1/mxdschunk.h
@@ -4,7 +4,7 @@
 #include "mxcore.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100dc7f8
+// VTABLEADDR 0x100dc7f8
 class MxDSChunk : public MxCore {
 public:
 	MxDSChunk();
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index c9984aa4..d64c2fa7 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -6,7 +6,7 @@
 #include "mxstring.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100dc890
+// VTABLEADDR 0x100dc890
 class MxDSFile : public MxDSSource {
 public:
 	__declspec(dllexport) MxDSFile(const char* filename, MxULong skipReadingChunks);
diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/mxdsmediaaction.h
index f987e8f9..5a7bfbcc 100644
--- a/LEGO1/mxdsmediaaction.h
+++ b/LEGO1/mxdsmediaaction.h
@@ -5,7 +5,7 @@
 #include "mxdsaction.h"
 #include "mxpoint32.h"
 
-// VTABLE 0x100dcd40
+// VTABLEADDR 0x100dcd40
 // SIZE 0xb8
 class MxDSMediaAction : public MxDSAction {
 public:
diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/mxdsmultiaction.h
index d36bef82..803abb13 100644
--- a/LEGO1/mxdsmultiaction.h
+++ b/LEGO1/mxdsmultiaction.h
@@ -4,7 +4,7 @@
 #include "mxdsaction.h"
 #include "mxdsactionlist.h"
 
-// VTABLE 0x100dcef0
+// VTABLEADDR 0x100dcef0
 // SIZE 0x9c
 class MxDSMultiAction : public MxDSAction {
 public:
diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h
index 9064fc81..421b9ef5 100644
--- a/LEGO1/mxdsobject.h
+++ b/LEGO1/mxdsobject.h
@@ -6,7 +6,7 @@
 #include "mxcore.h"
 #include "mxdstypes.h"
 
-// VTABLE 0x100dc868
+// VTABLEADDR 0x100dc868
 // SIZE 0x2c
 class MxDSObject : public MxCore {
 public:
diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/mxdsobjectaction.h
index 50b167b5..3c73acd1 100644
--- a/LEGO1/mxdsobjectaction.h
+++ b/LEGO1/mxdsobjectaction.h
@@ -3,7 +3,7 @@
 
 #include "mxdsmediaaction.h"
 
-// VTABLE 0x100dccf8
+// VTABLEADDR 0x100dccf8
 // SIZE 0xb8
 class MxDSObjectAction : public MxDSMediaAction {
 public:
diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/mxdsparallelaction.h
index bafb688d..1e6607f2 100644
--- a/LEGO1/mxdsparallelaction.h
+++ b/LEGO1/mxdsparallelaction.h
@@ -3,7 +3,7 @@
 
 #include "mxdsmultiaction.h"
 
-// VTABLE 0x100dcf80
+// VTABLEADDR 0x100dcf80
 // SIZE 0x9c
 class MxDSParallelAction : public MxDSMultiAction {
 public:
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/mxdsselectaction.h
index 8c61b867..a31ecdd0 100644
--- a/LEGO1/mxdsselectaction.h
+++ b/LEGO1/mxdsselectaction.h
@@ -5,7 +5,7 @@
 #include "mxdsparallelaction.h"
 #include "mxstringlist.h"
 
-// VTABLE 0x100dcfc8
+// VTABLEADDR 0x100dcfc8
 // SIZE 0xb0
 class MxDSSelectAction : public MxDSParallelAction {
 public:
diff --git a/LEGO1/mxdsserialaction.h b/LEGO1/mxdsserialaction.h
index 39cb2e6d..191d3465 100644
--- a/LEGO1/mxdsserialaction.h
+++ b/LEGO1/mxdsserialaction.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxdsmultiaction.h"
 
-// VTABLE 0x100dcf38
+// VTABLEADDR 0x100dcf38
 // SIZE 0xa8
 class MxDSSerialAction : public MxDSMultiAction {
 public:
diff --git a/LEGO1/mxdssound.h b/LEGO1/mxdssound.h
index d56a4471..27f1b349 100644
--- a/LEGO1/mxdssound.h
+++ b/LEGO1/mxdssound.h
@@ -3,7 +3,7 @@
 
 #include "mxdsmediaaction.h"
 
-// VTABLE 0x100dcdd0
+// VTABLEADDR 0x100dcdd0
 // SIZE 0xc0
 class MxDSSound : public MxDSMediaAction {
 public:
diff --git a/LEGO1/mxdssource.h b/LEGO1/mxdssource.h
index ff485952..7f431fe4 100644
--- a/LEGO1/mxdssource.h
+++ b/LEGO1/mxdssource.h
@@ -5,7 +5,7 @@
 
 class MxDSBuffer;
 
-// VTABLE 0x100dc8c8
+// VTABLEADDR 0x100dc8c8
 class MxDSSource : public MxCore {
 public:
 	MxDSSource() : m_lengthInDWords(0), m_pBuffer(NULL), m_position(-1) {}
diff --git a/LEGO1/mxdsstill.h b/LEGO1/mxdsstill.h
index 92921462..1e1df9b2 100644
--- a/LEGO1/mxdsstill.h
+++ b/LEGO1/mxdsstill.h
@@ -3,7 +3,7 @@
 
 #include "mxdsmediaaction.h"
 
-// VTABLE 0x100dce60
+// VTABLEADDR 0x100dce60
 // SIZE 0xb8
 class MxDSStill : public MxDSMediaAction {
 public:
diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/mxdsstreamingaction.h
index 609aac73..480e5b0b 100644
--- a/LEGO1/mxdsstreamingaction.h
+++ b/LEGO1/mxdsstreamingaction.h
@@ -5,7 +5,7 @@
 
 class MxDSBuffer;
 
-// VTABLE 0x100dd088
+// VTABLEADDR 0x100dd088
 // SIZE 0xb4
 class MxDSStreamingAction : public MxDSAction {
 public:
diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/mxdssubscriber.h
index c56835db..7c9b903d 100644
--- a/LEGO1/mxdssubscriber.h
+++ b/LEGO1/mxdssubscriber.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100dc698
+// VTABLEADDR 0x100dc698
 // SIZE 0x4c
 class MxDSSubscriber : public MxCore {
 public:
diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h
index 4ec82f1c..9da19c43 100644
--- a/LEGO1/mxentity.h
+++ b/LEGO1/mxentity.h
@@ -7,7 +7,7 @@
 #include "mxdsobject.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d5390
+// VTABLEADDR 0x100d5390
 // SIZE 0x10
 class MxEntity : public MxCore {
 public:
diff --git a/LEGO1/mxeventmanager.h b/LEGO1/mxeventmanager.h
index 33384187..16e96d25 100644
--- a/LEGO1/mxeventmanager.h
+++ b/LEGO1/mxeventmanager.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxmediamanager.h"
 
-// VTABLE 0x100dc900
+// VTABLEADDR 0x100dc900
 // SIZE 0x2c
 class MxEventManager : public MxMediaManager {
 public:
diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/mxeventpresenter.h
index 35ad8ae9..42d7d2c3 100644
--- a/LEGO1/mxeventpresenter.h
+++ b/LEGO1/mxeventpresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100dca88
+// VTABLEADDR 0x100dca88
 // SIZE 0x54
 class MxEventPresenter : public MxMediaPresenter {
 public:
diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/mxflcpresenter.h
index 99035172..43bedfe4 100644
--- a/LEGO1/mxflcpresenter.h
+++ b/LEGO1/mxflcpresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxvideopresenter.h"
 
-// VTABLE 0x100dc2c0
+// VTABLEADDR 0x100dc2c0
 // SIZE 0x68
 class MxFlcPresenter : public MxVideoPresenter {
 public:
diff --git a/LEGO1/mxhashtable.h b/LEGO1/mxhashtable.h
index f9a8df73..bde533c8 100644
--- a/LEGO1/mxhashtable.h
+++ b/LEGO1/mxhashtable.h
@@ -32,7 +32,7 @@ class MxHashTableNode {
 };
 
 // See MxOmni::Create
-// VTABLE 0x100dc1b0
+// VTABLEADDR 0x100dc1b0
 template <class T>
 class HashTableParent : public MxCore {
 public:
@@ -51,7 +51,7 @@ class HashTableParent : public MxCore {
 	void (*m_customDestructor)(T*); // +0xc
 };
 
-// VTABLE 0x100dc1e8
+// VTABLEADDR 0x100dc1e8
 template <class T>
 class MxHashTable : protected HashTableParent<T> {
 public:
diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/mxloopingflcpresenter.h
index 2107731b..b3f840c7 100644
--- a/LEGO1/mxloopingflcpresenter.h
+++ b/LEGO1/mxloopingflcpresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxflcpresenter.h"
 
-// VTABLE 0x100dc480
+// VTABLEADDR 0x100dc480
 // SIZE 0x6c
 class MxLoopingFlcPresenter : public MxFlcPresenter {
 public:
diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/mxloopingmidipresenter.h
index 45f03875..4b8633d8 100644
--- a/LEGO1/mxloopingmidipresenter.h
+++ b/LEGO1/mxloopingmidipresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxmidipresenter.h"
 
-// VTABLE 0x100dc240
+// VTABLEADDR 0x100dc240
 // SIZE 0x58
 class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 public:
diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/mxloopingsmkpresenter.h
index 54dad73b..e568c416 100644
--- a/LEGO1/mxloopingsmkpresenter.h
+++ b/LEGO1/mxloopingsmkpresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxsmkpresenter.h"
 
-// VTABLE 0x100dc540
+// VTABLEADDR 0x100dc540
 // SIZE 0x724
 class MxLoopingSmkPresenter : public MxSmkPresenter {
 public:
diff --git a/LEGO1/mxmatrix.h b/LEGO1/mxmatrix.h
index b9d5420d..869c4fc2 100644
--- a/LEGO1/mxmatrix.h
+++ b/LEGO1/mxmatrix.h
@@ -3,7 +3,7 @@
 
 #include "mxvector.h"
 
-// VTABLE 0x100d4350
+// VTABLEADDR 0x100d4350
 // SIZE 0x8
 class MxMatrix {
 public:
@@ -43,7 +43,7 @@ class MxMatrix {
 	float* m_data;
 };
 
-// VTABLE 0x100d4300
+// VTABLEADDR 0x100d4300
 // SIZE 0x48
 class MxMatrixData : public MxMatrix {
 public:
diff --git a/LEGO1/mxmediamanager.h b/LEGO1/mxmediamanager.h
index 88666b45..1f51ff28 100644
--- a/LEGO1/mxmediamanager.h
+++ b/LEGO1/mxmediamanager.h
@@ -7,7 +7,7 @@
 #include "mxthread.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100dc6b0
+// VTABLEADDR 0x100dc6b0
 // SIZE 0x2c
 class MxMediaManager : public MxCore {
 public:
diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/mxmediapresenter.h
index 59ca015b..7acc0f16 100644
--- a/LEGO1/mxmediapresenter.h
+++ b/LEGO1/mxmediapresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxpresenter.h"
 
-// VTABLE 0x100d4cd8
+// VTABLEADDR 0x100d4cd8
 class MxMediaPresenter : public MxPresenter {
 public:
 	inline MxMediaPresenter() { Init(); }
diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/mxmidipresenter.h
index 675f79b5..947671fe 100644
--- a/LEGO1/mxmidipresenter.h
+++ b/LEGO1/mxmidipresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxmusicpresenter.h"
 
-// VTABLE 0x100dca20
+// VTABLEADDR 0x100dca20
 class MxMIDIPresenter : public MxMusicPresenter {
 public:
 	MxMIDIPresenter();
diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/mxmusicmanager.h
index f128b1b6..19b47651 100644
--- a/LEGO1/mxmusicmanager.h
+++ b/LEGO1/mxmusicmanager.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxaudiomanager.h"
 
-// VTABLE 0x100dc930
+// VTABLEADDR 0x100dc930
 // SIZE 0x58
 class MxMusicManager : public MxAudioManager {
 public:
diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/mxmusicpresenter.h
index 02edf1a5..e82fbbfc 100644
--- a/LEGO1/mxmusicpresenter.h
+++ b/LEGO1/mxmusicpresenter.h
@@ -3,7 +3,7 @@
 
 #include "mxaudiopresenter.h"
 
-// VTABLE 0x100dc9b8
+// VTABLEADDR 0x100dc9b8
 // SIZE 0x54
 class MxMusicPresenter : public MxAudioPresenter {
 public:
diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/mxnextactiondatastart.h
index 480e39b3..2dc78986 100644
--- a/LEGO1/mxnextactiondatastart.h
+++ b/LEGO1/mxnextactiondatastart.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100dc9a0
+// VTABLEADDR 0x100dc9a0
 class MxNextActionDataStart : public MxCore {};
 
 #endif // MXNEXTACTIONDATASTART_H
diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/mxnotificationmanager.h
index 1dcfb49a..66833dc3 100644
--- a/LEGO1/mxnotificationmanager.h
+++ b/LEGO1/mxnotificationmanager.h
@@ -24,7 +24,7 @@ class MxIdList : public list<MxU32> {};
 
 class MxNotificationPtrList : public list<MxNotification*> {};
 
-// VTABLE 0x100dc078
+// VTABLEADDR 0x100dc078
 class MxNotificationManager : public MxCore {
 private:
 	MxNotificationPtrList* m_queue;    // 0x8
diff --git a/LEGO1/mxnotificationparam.h b/LEGO1/mxnotificationparam.h
index e5654243..3f7994ef 100644
--- a/LEGO1/mxnotificationparam.h
+++ b/LEGO1/mxnotificationparam.h
@@ -33,7 +33,7 @@ enum MxParamType {
 	MXTRANSITIONMANAGER_TRANSITIONENDED = 24
 };
 
-// VTABLE 0x100d56e0
+// VTABLEADDR 0x100d56e0
 class MxNotificationParam : public MxParam {
 public:
 	inline MxNotificationParam(MxParamType p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender) {}
diff --git a/LEGO1/mxobjectfactory.h b/LEGO1/mxobjectfactory.h
index 0c8d2ad7..eeaabd4e 100644
--- a/LEGO1/mxobjectfactory.h
+++ b/LEGO1/mxobjectfactory.h
@@ -18,7 +18,7 @@
 	X(MxLoopingSmkPresenter)                                                                                           \
 	X(MxLoopingMIDIPresenter)
 
-// VTABLE 0x100dc220
+// VTABLEADDR 0x100dc220
 class MxObjectFactory : public MxCore {
 public:
 	MxObjectFactory();
diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h
index 40fad828..4061cf14 100644
--- a/LEGO1/mxomni.h
+++ b/LEGO1/mxomni.h
@@ -21,7 +21,7 @@ class MxTimer;
 class MxVariableTable;
 class MxVideoManager;
 
-// VTABLE 0x100dc168
+// VTABLEADDR 0x100dc168
 // SIZE 0x68
 class MxOmni : public MxCore {
 public:
diff --git a/LEGO1/mxpalette.h b/LEGO1/mxpalette.h
index 51687a97..8a0fc5e3 100644
--- a/LEGO1/mxpalette.h
+++ b/LEGO1/mxpalette.h
@@ -6,7 +6,7 @@
 
 #include <ddraw.h>
 
-// VTABLE 0x100dc848
+// VTABLEADDR 0x100dc848
 // SIZE 0x414
 class MxPalette : public MxCore {
 public:
diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h
index ce61fa7e..447a2bf4 100644
--- a/LEGO1/mxpresenter.h
+++ b/LEGO1/mxpresenter.h
@@ -10,7 +10,7 @@
 
 class MxStreamController;
 
-// VTABLE 0x100d4d38
+// VTABLEADDR 0x100d4d38
 class MxPresenter : public MxCore {
 public:
 	enum TickleState {
diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/mxpresenterlist.h
index b1a780bc..411c0d98 100644
--- a/LEGO1/mxpresenterlist.h
+++ b/LEGO1/mxpresenterlist.h
@@ -6,14 +6,14 @@
 class MxPresenter;
 
 // Unclear what the purpose of this class is
-// VTABLE 0x100d62f0
+// VTABLEADDR 0x100d62f0
 // SIZE 0x18
 class MxPresenterListParent : public MxList<MxPresenter*> {
 public:
 	MxPresenterListParent() { m_customDestructor = Destroy; }
 };
 
-// VTABLE 0x100d6308
+// VTABLEADDR 0x100d6308
 // SIZE 0x18
 class MxPresenterList : public MxPresenterListParent {
 public:
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index d728c42d..47622c58 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -4,7 +4,7 @@
 #include "mxdsbuffer.h"
 #include "mxstreamcontroller.h"
 
-// VTABLE 0x100dc728
+// VTABLEADDR 0x100dc728
 // SIZE 0x98
 class MxRAMStreamController : public MxStreamController {
 public:
diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/mxramstreamprovider.h
index 4b6d5a5c..1d389a15 100644
--- a/LEGO1/mxramstreamprovider.h
+++ b/LEGO1/mxramstreamprovider.h
@@ -3,7 +3,7 @@
 
 #include "mxstreamprovider.h"
 
-// VTABLE 0x100dd0d0
+// VTABLEADDR 0x100dd0d0
 class MxRAMStreamProvider : public MxStreamProvider {
 public:
 	MxRAMStreamProvider();
diff --git a/LEGO1/mxregion.h b/LEGO1/mxregion.h
index 25482207..3f53810a 100644
--- a/LEGO1/mxregion.h
+++ b/LEGO1/mxregion.h
@@ -5,7 +5,7 @@
 #include "mxcore.h"
 #include "mxrect32.h"
 
-// VTABLE 0x100dcae8
+// VTABLEADDR 0x100dcae8
 // SIZE 0x1c
 class MxRegion : public MxCore {
 public:
diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/mxsmkpresenter.h
index 29b23afc..1f9958ee 100644
--- a/LEGO1/mxsmkpresenter.h
+++ b/LEGO1/mxsmkpresenter.h
@@ -6,7 +6,7 @@
 
 #include <smk.h>
 
-// VTABLE 0x100dc348
+// VTABLEADDR 0x100dc348
 // SIZE 0x720
 class MxSmkPresenter : public MxVideoPresenter {
 public:
diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/mxsoundmanager.h
index ef42e8df..9369f027 100644
--- a/LEGO1/mxsoundmanager.h
+++ b/LEGO1/mxsoundmanager.h
@@ -6,7 +6,7 @@
 
 #include <dsound.h>
 
-// VTABLE 0x100dc128
+// VTABLEADDR 0x100dc128
 // SIZE 0x3c
 class MxSoundManager : public MxAudioManager {
 public:
diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/mxsoundpresenter.h
index 57997646..abf2877c 100644
--- a/LEGO1/mxsoundpresenter.h
+++ b/LEGO1/mxsoundpresenter.h
@@ -4,7 +4,7 @@
 #include "mxaudiopresenter.h"
 #include "mxomni.h"
 
-// VTABLE 0x100d4b08
+// VTABLEADDR 0x100d4b08
 class MxSoundPresenter : public MxAudioPresenter {
 public:
 	virtual ~MxSoundPresenter() override;
diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/mxstillpresenter.h
index f812b545..35303e6c 100644
--- a/LEGO1/mxstillpresenter.h
+++ b/LEGO1/mxstillpresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxvideopresenter.h"
 
-// VTABLE 0x100d7a38
+// VTABLEADDR 0x100d7a38
 // SIZE 0x6c
 class MxStillPresenter : public MxVideoPresenter {
 public:
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h
index 5043b722..ab939b22 100644
--- a/LEGO1/mxstreamchunk.h
+++ b/LEGO1/mxstreamchunk.h
@@ -3,7 +3,7 @@
 
 #include "mxdschunk.h"
 
-// VTABLE 0x100dc2a8
+// VTABLEADDR 0x100dc2a8
 class MxStreamChunk : public MxDSChunk {};
 
 #endif // MXSTREAMCHUNK_H
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index 4bee2f4c..bd30e56a 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -9,7 +9,7 @@
 #include "mxdsobject.h"
 #include "mxstreamprovider.h"
 
-// VTABLE 0x100dc968
+// VTABLEADDR 0x100dc968
 // SIZE 0x64
 class MxStreamController : public MxCore {
 public:
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 6a62146a..fb6110c2 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -56,7 +56,7 @@ class MxStreamerNotification : public MxNotificationParam {
 	MxStreamController* m_controller;
 };
 
-// VTABLE 0x100dc710
+// VTABLEADDR 0x100dc710
 // SIZE 0x2c
 class MxStreamer : public MxCore {
 public:
diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/mxstreamprovider.h
index 384b373a..e372d9ab 100644
--- a/LEGO1/mxstreamprovider.h
+++ b/LEGO1/mxstreamprovider.h
@@ -5,7 +5,7 @@
 #include "mxcore.h"
 #include "mxdsfile.h"
 
-// VTABLE 0x100dd100
+// VTABLEADDR 0x100dd100
 // SIZE 0x10
 class MxStreamProvider : public MxCore {
 public:
diff --git a/LEGO1/mxstring.h b/LEGO1/mxstring.h
index df5863b7..fc1ddc7b 100644
--- a/LEGO1/mxstring.h
+++ b/LEGO1/mxstring.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100dc110
+// VTABLEADDR 0x100dc110
 class MxString : public MxCore {
 public:
 	__declspec(dllexport) MxString(const MxString&);
diff --git a/LEGO1/mxstringlist.h b/LEGO1/mxstringlist.h
index f92d2b7d..d244f2ed 100644
--- a/LEGO1/mxstringlist.h
+++ b/LEGO1/mxstringlist.h
@@ -4,11 +4,11 @@
 #include "mxlist.h"
 #include "mxstring.h"
 
-// VTABLE 0x100dd040
+// VTABLEADDR 0x100dd040
 // SIZE 0x18
 class MxStringList : public MxList<MxString> {};
 
-// VTABLE 0x100dd058
+// VTABLEADDR 0x100dd058
 typedef MxListCursorChild<MxString> MxStringListCursor;
 
 // OFFSET: LEGO1 0x100cb3c0 TEMPLATE
diff --git a/LEGO1/mxticklemanager.h b/LEGO1/mxticklemanager.h
index 93d748c3..f1e93821 100644
--- a/LEGO1/mxticklemanager.h
+++ b/LEGO1/mxticklemanager.h
@@ -32,7 +32,7 @@ class MxTickleClient {
 
 typedef list<MxTickleClient*> MxTickleClientPtrList;
 
-// VTABLE 0x100d86d8
+// VTABLEADDR 0x100d86d8
 class MxTickleManager : public MxCore {
 public:
 	inline MxTickleManager() {}
diff --git a/LEGO1/mxtimer.h b/LEGO1/mxtimer.h
index 9cab7358..c006f628 100644
--- a/LEGO1/mxtimer.h
+++ b/LEGO1/mxtimer.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100dc0e0
+// VTABLEADDR 0x100dc0e0
 // SIZE 0x10
 class MxTimer : public MxCore {
 public:
diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/mxtransitionmanager.h
index 933c1c0a..41e8b23b 100644
--- a/LEGO1/mxtransitionmanager.h
+++ b/LEGO1/mxtransitionmanager.h
@@ -7,7 +7,7 @@
 
 #include <ddraw.h>
 
-// VTABLE 0x100d7ea0
+// VTABLEADDR 0x100d7ea0
 class MxTransitionManager : public MxCore {
 public:
 	MxTransitionManager();
diff --git a/LEGO1/mxvariable.h b/LEGO1/mxvariable.h
index ef1a6d28..fce4a86b 100644
--- a/LEGO1/mxvariable.h
+++ b/LEGO1/mxvariable.h
@@ -4,7 +4,7 @@
 #include "mxcore.h"
 #include "mxstring.h"
 
-// VTABLE 0x100d7498
+// VTABLEADDR 0x100d7498
 // SIZE 0x24
 class MxVariable {
 public:
diff --git a/LEGO1/mxvariabletable.h b/LEGO1/mxvariabletable.h
index 8bffab81..b0bd075a 100644
--- a/LEGO1/mxvariabletable.h
+++ b/LEGO1/mxvariabletable.h
@@ -5,7 +5,7 @@
 #include "mxtypes.h"
 #include "mxvariable.h"
 
-// VTABLE 0x100dc1c8
+// VTABLEADDR 0x100dc1c8
 // SIZE 0x28
 class MxVariableTable : public MxHashTable<MxVariable> {
 public:
diff --git a/LEGO1/mxvector.h b/LEGO1/mxvector.h
index 783f3f22..670afb8f 100644
--- a/LEGO1/mxvector.h
+++ b/LEGO1/mxvector.h
@@ -5,7 +5,7 @@
 
 #include <vec.h>
 
-// VTABLE 0x100d4288
+// VTABLEADDR 0x100d4288
 // SIZE 0x8
 class MxVector2 {
 public:
@@ -68,7 +68,7 @@ class MxVector2 {
 	float* m_data;
 };
 
-// VTABLE 0x100d4518
+// VTABLEADDR 0x100d4518
 // SIZE 0x8
 class MxVector3 : public MxVector2 {
 public:
@@ -100,7 +100,7 @@ class MxVector3 : public MxVector2 {
 	inline void Fill(float p_value) { EqualsScalar(&p_value); }
 };
 
-// VTABLE 0x100d45a0
+// VTABLEADDR 0x100d45a0
 // SIZE 0x8
 class MxVector4 : public MxVector3 {
 public:
@@ -131,7 +131,7 @@ class MxVector4 : public MxVector3 {
 	virtual void UnknownQuaternionOp(MxVector4* p_a, MxVector4* p_b);
 };
 
-// VTABLE 0x100d4488
+// VTABLEADDR 0x100d4488
 // SIZE 0x14
 class MxVector3Data : public MxVector3 {
 public:
@@ -158,7 +158,7 @@ class MxVector3Data : public MxVector3 {
 	}
 };
 
-// VTABLE 0x100d41e8
+// VTABLEADDR 0x100d41e8
 // SIZE 0x18
 class MxVector4Data : public MxVector4 {
 public:
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h
index b2fe5d5b..453e134a 100644
--- a/LEGO1/mxvideomanager.h
+++ b/LEGO1/mxvideomanager.h
@@ -7,7 +7,7 @@
 #include "mxregion.h"
 #include "mxvideoparam.h"
 
-// VTABLE 0x100dc810
+// VTABLEADDR 0x100dc810
 // SIZE 0x64
 class MxVideoManager : public MxMediaManager {
 public:
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h
index 14ad2d78..993a67e7 100644
--- a/LEGO1/mxvideopresenter.h
+++ b/LEGO1/mxvideopresenter.h
@@ -5,7 +5,7 @@
 #include "mxbitmap.h"
 #include "mxmediapresenter.h"
 
-// VTABLE 0x100d4be8
+// VTABLEADDR 0x100d4be8
 class MxVideoPresenter : public MxMediaPresenter {
 public:
 	MxVideoPresenter() { Init(); }
diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/mxwavepresenter.h
index 06300b7f..424dd5e5 100644
--- a/LEGO1/mxwavepresenter.h
+++ b/LEGO1/mxwavepresenter.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxsoundpresenter.h"
 
-// VTABLE 0x100d49a8
+// VTABLEADDR 0x100d49a8
 // SIZE 0x6c
 class MxWavePresenter : public MxSoundPresenter {
 private:
diff --git a/LEGO1/pizza.h b/LEGO1/pizza.h
index eed42084..7a346e4e 100644
--- a/LEGO1/pizza.h
+++ b/LEGO1/pizza.h
@@ -8,7 +8,7 @@
 #include "mxticklemanager.h"
 #include "mxtypes.h"
 
-// VTABLE 0x100d7380
+// VTABLEADDR 0x100d7380
 // SIZE 0x9c
 class Pizza : public IsleActor {
 public:
diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/pizzamissionstate.h
index 451223c6..a59e3b1c 100644
--- a/LEGO1/pizzamissionstate.h
+++ b/LEGO1/pizzamissionstate.h
@@ -12,7 +12,7 @@ struct PizzaMissionStateEntry {
 	undefined m_unk18[6];
 };
 
-// VTABLE 0x100d7408
+// VTABLEADDR 0x100d7408
 class PizzaMissionState : public LegoState {
 public:
 	// OFFSET: LEGO1 0x10039290
diff --git a/LEGO1/pizzeria.h b/LEGO1/pizzeria.h
index b7e1a4e6..76e4d3d3 100644
--- a/LEGO1/pizzeria.h
+++ b/LEGO1/pizzeria.h
@@ -3,7 +3,7 @@
 
 #include "isleactor.h"
 
-// VTABLE 0x100d5520
+// VTABLEADDR 0x100d5520
 // SIZE 0x84
 class Pizzeria : public IsleActor {
 public:
diff --git a/LEGO1/pizzeriastate.h b/LEGO1/pizzeriastate.h
index 0c7143bf..3f103081 100644
--- a/LEGO1/pizzeriastate.h
+++ b/LEGO1/pizzeriastate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d5ee8
+// VTABLEADDR 0x100d5ee8
 // SIZE 0xb4
 class PizzeriaState : public LegoState {
 public:
diff --git a/LEGO1/police.h b/LEGO1/police.h
index 0d661507..addb7b90 100644
--- a/LEGO1/police.h
+++ b/LEGO1/police.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d8a80
+// VTABLEADDR 0x100d8a80
 // SIZE 0x110
 // Radio at 0xf8
 class Police : public LegoWorld {
diff --git a/LEGO1/policeentity.h b/LEGO1/policeentity.h
index c4aa6ba9..34f5f3b8 100644
--- a/LEGO1/policeentity.h
+++ b/LEGO1/policeentity.h
@@ -3,7 +3,7 @@
 
 #include "buildingentity.h"
 
-// VTABLE 0x100d4ab0
+// VTABLEADDR 0x100d4ab0
 // SIZE 0x68
 class PoliceEntity : public BuildingEntity {
 public:
diff --git a/LEGO1/policestate.h b/LEGO1/policestate.h
index f126a78b..4a2db3b5 100644
--- a/LEGO1/policestate.h
+++ b/LEGO1/policestate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d8af0
+// VTABLEADDR 0x100d8af0
 // SIZE 0x10
 class PoliceState : public LegoState {
 public:
diff --git a/LEGO1/racecar.h b/LEGO1/racecar.h
index f07a2540..3e6766d4 100644
--- a/LEGO1/racecar.h
+++ b/LEGO1/racecar.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d6918
+// VTABLEADDR 0x100d6918
 // SIZE 0x164
 class RaceCar : public IslePathActor {
 public:
diff --git a/LEGO1/racestandsentity.h b/LEGO1/racestandsentity.h
index 532d401b..320f298d 100644
--- a/LEGO1/racestandsentity.h
+++ b/LEGO1/racestandsentity.h
@@ -3,7 +3,7 @@
 
 #include "buildingentity.h"
 
-// VTABLE 0x100d48a8
+// VTABLEADDR 0x100d48a8
 // SIZE 0x68
 class RaceStandsEntity : public BuildingEntity {};
 
diff --git a/LEGO1/racestate.h b/LEGO1/racestate.h
index 9cc8f364..e78db677 100644
--- a/LEGO1/racestate.h
+++ b/LEGO1/racestate.h
@@ -11,7 +11,7 @@ struct RaceStateEntry {
 	MxU16 m_color;
 };
 
-// VTABLE 0x100d5e30
+// VTABLEADDR 0x100d5e30
 // SIZE 0x2c
 class RaceState : public LegoState {
 public:
diff --git a/LEGO1/radio.h b/LEGO1/radio.h
index b0f785c6..9d0fccd3 100644
--- a/LEGO1/radio.h
+++ b/LEGO1/radio.h
@@ -3,7 +3,7 @@
 
 #include "mxcore.h"
 
-// VTABLE 0x100d6d10
+// VTABLEADDR 0x100d6d10
 class Radio : public MxCore {
 public:
 	virtual ~Radio() override;
diff --git a/LEGO1/radiostate.h b/LEGO1/radiostate.h
index 58b75978..4d1ec85f 100644
--- a/LEGO1/radiostate.h
+++ b/LEGO1/radiostate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d6d28
+// VTABLEADDR 0x100d6d28
 // SIZE 0x30
 class RadioState : public LegoState {
 public:
diff --git a/LEGO1/registrationbook.h b/LEGO1/registrationbook.h
index 17009204..f2e703f9 100644
--- a/LEGO1/registrationbook.h
+++ b/LEGO1/registrationbook.h
@@ -3,7 +3,7 @@
 
 #include "legoworld.h"
 
-// VTABLE 0x100d9928
+// VTABLEADDR 0x100d9928
 // SIZE 0x2d0
 class RegistrationBook : public LegoWorld {
 public:
diff --git a/LEGO1/score.h b/LEGO1/score.h
index 612bba4c..50b1b576 100644
--- a/LEGO1/score.h
+++ b/LEGO1/score.h
@@ -7,7 +7,7 @@
 #include "mxtype17notificationparam.h"
 #include "scorestate.h"
 
-// VTABLE 0x100d4018
+// VTABLEADDR 0x100d4018
 // SIZE 0x104
 class Score : public LegoWorld {
 public:
diff --git a/LEGO1/scorestate.h b/LEGO1/scorestate.h
index 3452db50..2fd16940 100644
--- a/LEGO1/scorestate.h
+++ b/LEGO1/scorestate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d53f8
+// VTABLEADDR 0x100d53f8
 // SIZE 0xc
 class ScoreState : public LegoState {
 public:
diff --git a/LEGO1/skateboard.h b/LEGO1/skateboard.h
index d9f8f4eb..8192a487 100644
--- a/LEGO1/skateboard.h
+++ b/LEGO1/skateboard.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d55f0
+// VTABLEADDR 0x100d55f0
 // SIZE 0x168
 class SkateBoard : public IslePathActor {
 public:
diff --git a/LEGO1/towtrack.h b/LEGO1/towtrack.h
index 8e541aec..c7022548 100644
--- a/LEGO1/towtrack.h
+++ b/LEGO1/towtrack.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "islepathactor.h"
 
-// VTABLE 0x100d7ee0
+// VTABLEADDR 0x100d7ee0
 // SIZE 0x180
 class TowTrack : public IslePathActor {
 public:
diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/towtrackmissionstate.h
index 037d025b..e1833533 100644
--- a/LEGO1/towtrackmissionstate.h
+++ b/LEGO1/towtrackmissionstate.h
@@ -3,7 +3,7 @@
 
 #include "legostate.h"
 
-// VTABLE 0x100d7fd8
+// VTABLEADDR 0x100d7fd8
 // SIZE 0x28
 class TowTrackMissionState : public LegoState {
 public:
diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index b9adf347..93aa65fc 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -247,7 +247,7 @@ def can_resolve_register_differences(original_asm, new_asm):
 # Generate basename of original file, used in locating OFFSET lines
 basename = os.path.basename(os.path.splitext(original)[0])
 funcpattern = '// OFFSET:'
-vtblpattern = '// VTABLE'
+vtblpattern = '// VTABLE '
 in_class = None
 
 for subdir, dirs, files in os.walk(source):