diff --git a/LEGO1/lego/legoomni/include/act2actor.h b/LEGO1/lego/legoomni/include/act2actor.h
index 6b93af65..9e08191c 100644
--- a/LEGO1/lego/legoomni/include/act2actor.h
+++ b/LEGO1/lego/legoomni/include/act2actor.h
@@ -4,8 +4,8 @@
 #include "legoanimactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d6078 LegoPathActor
-	VTABLE: LEGO1 0x100d6148 LegoAnimActor
+	XVTABLE: LEGO1 0x100d6078 LegoPathActor
+	XVTABLE: LEGO1 0x100d6148 LegoAnimActor
 */
 // SIZE 0x1a8
 class Act2Actor : public LegoAnimActor {
diff --git a/LEGO1/lego/legoomni/include/act3actor.h b/LEGO1/lego/legoomni/include/act3actor.h
index 002839fe..f4ed3124 100644
--- a/LEGO1/lego/legoomni/include/act3actor.h
+++ b/LEGO1/lego/legoomni/include/act3actor.h
@@ -4,8 +4,8 @@
 #include "legoanimactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d7668 LegoPathActor
-	VTABLE: LEGO1 0x100d7738 LegoAnimActor
+	XVTABLE: LEGO1 0x100d7668 LegoPathActor
+	XVTABLE: LEGO1 0x100d7738 LegoAnimActor
 */
 // SIZE 0x178
 class Act3Actor : public LegoAnimActor {
diff --git a/LEGO1/lego/legoomni/include/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
index 180bab99..4ca6d5c4 100644
--- a/LEGO1/lego/legoomni/include/act3shark.h
+++ b/LEGO1/lego/legoomni/include/act3shark.h
@@ -4,8 +4,8 @@
 #include "legoanimactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d7920 LegoPathActor
-	VTABLE: LEGO1 0x100d79f0 LegoAnimActor
+	XVTABLE: LEGO1 0x100d7920 LegoPathActor
+	XVTABLE: LEGO1 0x100d79f0 LegoAnimActor
 */
 // SIZE 0x1a8
 class Act3Shark : public LegoAnimActor {
diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index 6f9dee2d..bbd7d2bc 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -5,8 +5,8 @@
 #include "mxtypes.h"
 
 /*
-	VTABLE: LEGO1 0x100d6790 LegoPathActor
-	VTABLE: LEGO1 0x100d6860 LegoAnimActor
+	XVTABLE: LEGO1 0x100d6790 LegoPathActor
+	XVTABLE: LEGO1 0x100d6860 LegoAnimActor
 */
 // SIZE 0x174
 class BumpBouy : public LegoAnimActor {
diff --git a/LEGO1/lego/legoomni/include/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h
index 42763b84..9054e0b8 100644
--- a/LEGO1/lego/legoomni/include/legoanimactor.h
+++ b/LEGO1/lego/legoomni/include/legoanimactor.h
@@ -5,8 +5,8 @@
 #include "legopathactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d5440 LegoPathActor
-	VTABLE: LEGO1 0x100d5510 LegoAnimActor
+	XVTABLE: LEGO1 0x100d5440 LegoPathActor
+	XVTABLE: LEGO1 0x100d5510 LegoAnimActor
 */
 // SIZE 0x174
 class LegoAnimActor : public virtual LegoPathActor {
diff --git a/LEGO1/lego/legoomni/include/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h
index 3d78db17..1efeafe1 100644
--- a/LEGO1/lego/legoomni/include/legocarraceactor.h
+++ b/LEGO1/lego/legoomni/include/legocarraceactor.h
@@ -4,10 +4,10 @@
 #include "legoraceactor.h"
 
 /*
-	VTABLE: LEGO1 0x100da0c0 LegoRaceActor
-	VTABLE: LEGO1 0x100da0c8 LegoAnimActor
-	VTABLE: LEGO1 0x100da0d8 LegoPathActor
-	VTABLE: LEGO1 0x100da1a8 LegoCarRaceActor
+	XVTABLE: LEGO1 0x100da0c0 LegoRaceActor
+	XVTABLE: LEGO1 0x100da0c8 LegoAnimActor
+	XVTABLE: LEGO1 0x100da0d8 LegoPathActor
+	XVTABLE: LEGO1 0x100da1a8 LegoCarRaceActor
 */
 // SIZE 0x1a0
 class LegoCarRaceActor : public virtual LegoRaceActor {
diff --git a/LEGO1/lego/legoomni/include/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h
index 0aaf58f2..f32b9702 100644
--- a/LEGO1/lego/legoomni/include/legoextraactor.h
+++ b/LEGO1/lego/legoomni/include/legoextraactor.h
@@ -4,9 +4,9 @@
 #include "legoanimactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d6c00 LegoAnimActor
-	VTABLE: LEGO1 0x100d6c10 LegoPathActor
-	VTABLE: LEGO1 0x100d6cdc LegoExtraActor
+	XVTABLE: LEGO1 0x100d6c00 LegoAnimActor
+	XVTABLE: LEGO1 0x100d6c10 LegoPathActor
+	XVTABLE: LEGO1 0x100d6cdc LegoExtraActor
 */
 // SIZE 0x1dc
 class LegoExtraActor : public virtual LegoAnimActor {
diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index c2e6d813..f3f97243 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -5,11 +5,11 @@
 #include "legoracemap.h"
 
 /*
-	VTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
-	VTABLE: LEGO1 0x100d5a28 LegoRaceActor
-	VTABLE: LEGO1 0x100d5a30 LegoAnimActor
-	VTABLE: LEGO1 0x100d5a40 LegoPathActor
-	VTABLE: LEGO1 0x100d5b10 LegoRaceMap
+	XVTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
+	XVTABLE: LEGO1 0x100d5a28 LegoRaceActor
+	XVTABLE: LEGO1 0x100d5a30 LegoAnimActor
+	XVTABLE: LEGO1 0x100d5a40 LegoPathActor
+	XVTABLE: LEGO1 0x100d5b10 LegoRaceMap
 */
 // SIZE 0x1dc
 class LegoJetski : public LegoJetskiRaceActor, public LegoRaceMap {
diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
index d24566f5..081ef617 100644
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -4,10 +4,10 @@
 #include "legocarraceactor.h"
 
 /*
-	VTABLE: LEGO1 0x100da208 LegoCarRaceActor
-	VTABLE: LEGO1 0x100da228 LegoRaceActor
-	VTABLE: LEGO1 0x100da230 LegoAnimActor
-	VTABLE: LEGO1 0x100da240 LegoPathActor
+	XVTABLE: LEGO1 0x100da208 LegoCarRaceActor
+	XVTABLE: LEGO1 0x100da228 LegoRaceActor
+	XVTABLE: LEGO1 0x100da230 LegoAnimActor
+	XVTABLE: LEGO1 0x100da240 LegoPathActor
 */
 // SIZE 0x1a8
 class LegoJetskiRaceActor : public virtual LegoCarRaceActor {
diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
index d43a6799..b89bf096 100644
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -5,9 +5,9 @@
 #include "realtime/matrix.h"
 
 /*
-	VTABLE: LEGO1 0x100d5b78 LegoAnimActor
-	VTABLE: LEGO1 0x100d5b88 LegoPathActor
-	VTABLE: LEGO1 0x100d5c54 LegoRaceActor
+	XVTABLE: LEGO1 0x100d5b78 LegoAnimActor
+	XVTABLE: LEGO1 0x100d5b88 LegoPathActor
+	XVTABLE: LEGO1 0x100d5c54 LegoRaceActor
 */
 // SIZE 0x180
 class LegoRaceActor : public virtual LegoAnimActor {
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index 331f11f7..9e80e392 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -6,11 +6,11 @@
 #include "legoracemap.h"
 
 /*
-	VTABLE: LEGO1 0x100d58a0 LegoRaceActor
-	VTABLE: LEGO1 0x100d58a8 LegoAnimActor
-	VTABLE: LEGO1 0x100d58b8 LegoPathActor
-	VTABLE: LEGO1 0x100d5894 LegoRaceMap
-	VTABLE: LEGO1 0x100d5898 LegoCarRaceActor
+	XVTABLE: LEGO1 0x100d58a0 LegoRaceActor
+	XVTABLE: LEGO1 0x100d58a8 LegoAnimActor
+	XVTABLE: LEGO1 0x100d58b8 LegoPathActor
+	XVTABLE: LEGO1 0x100d5894 LegoRaceMap
+	XVTABLE: LEGO1 0x100d5898 LegoCarRaceActor
 */
 // SIZE 0x200
 class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h
index 7bfce972..69ebbd1c 100644
--- a/LEGO1/lego/legoomni/include/legoracemap.h
+++ b/LEGO1/lego/legoomni/include/legoracemap.h
@@ -4,10 +4,10 @@
 #include "legoraceactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d5510 LegoRaceActor
-	VTABLE: LEGO1 0x100d5510 LegoAnimActor
-	VTABLE: LEGO1 0x100d5440 LegoPathActor
-	VTABLE: LEGO1 0x100d5510 LegoRaceMap
+	XVTABLE: LEGO1 0x100d5510 LegoRaceActor
+	XVTABLE: LEGO1 0x100d5510 LegoAnimActor
+	XVTABLE: LEGO1 0x100d5440 LegoPathActor
+	XVTABLE: LEGO1 0x100d5510 LegoRaceMap
 */
 // SIZE 0x1b4
 class LegoRaceMap : public virtual LegoRaceActor {
diff --git a/LEGO1/lego/legoomni/include/raceskel.h b/LEGO1/lego/legoomni/include/raceskel.h
index 6d9a270b..3295839f 100644
--- a/LEGO1/lego/legoomni/include/raceskel.h
+++ b/LEGO1/lego/legoomni/include/raceskel.h
@@ -4,8 +4,8 @@
 #include "legoanimactor.h"
 
 /*
-	VTABLE: LEGO1 0x100d7668 LegoPathActor
-	VTABLE: LEGO1 0x100d7738 LegoAnimActor
+	XVTABLE: LEGO1 0x100d7668 LegoPathActor
+	XVTABLE: LEGO1 0x100d7738 LegoAnimActor
 */
 // SIZE 0x178
 class RaceSkel : public LegoAnimActor {