diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index c079f21b..16a54114 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -58,40 +58,40 @@ MxResult MxDiskStreamController::Open(const char* p_filename)
 }
 
 // FUNCTION: LEGO1 0x100c7880
-MxResult MxDiskStreamController::vtable0x18(undefined4 p_unknown, undefined4 p_unknown2)
+MxResult MxDiskStreamController::VTable0x18(undefined4 p_unknown, undefined4 p_unknown2)
 {
 	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x100c7960
-MxResult MxDiskStreamController::vtable0x34(undefined4 p_unknown)
+MxResult MxDiskStreamController::VTable0x34(undefined4 p_unknown)
 {
 	return FAILURE;
 }
 
 // STUB: LEGO1 0x100c7ac0
-MxResult MxDiskStreamController::vtable0x28()
+MxResult MxDiskStreamController::VTable0x28()
 {
 	// TODO
 	return FAILURE;
 }
 
 // STUB: LEGO1 0x100c7c00
-MxResult MxDiskStreamController::vtable0x30(undefined4 p_unknown)
+MxResult MxDiskStreamController::VTable0x30(undefined4 p_unknown)
 {
 	// TODO
 	return FAILURE;
 }
 
 // STUB: LEGO1 0x100c7ff0
-MxResult MxDiskStreamController::vtable0x20(MxDSAction* p_action)
+MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
 {
 	// TODO
 	return FAILURE;
 }
 
 // STUB: LEGO1 0x100c8160
-MxResult MxDiskStreamController::vtable0x24(undefined4 p_unknown)
+MxResult MxDiskStreamController::VTable0x24(undefined4 p_unknown)
 {
 	// TODO
 	return FAILURE;
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 8709c23d..c58a1bc7 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -18,12 +18,12 @@ class MxDiskStreamController : public MxStreamController {
 
 	virtual MxResult Tickle() override;                                                // vtable+0x8
 	virtual MxResult Open(const char* p_filename) override;                            // vtable+0x14
-	virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2) override; // vtable+0x18
-	virtual MxResult vtable0x20(MxDSAction* p_action) override;                        // vtable+0x20
-	virtual MxResult vtable0x24(undefined4 p_unknown) override;                        // vtable+0x24
-	virtual MxResult vtable0x28() override;                                            // vtable+0x28
-	virtual MxResult vtable0x30(undefined4 p_unknown) override;                        // vtable+0x30
-	virtual MxResult vtable0x34(undefined4 p_unknown);                                 // vtable+0x34
+	virtual MxResult VTable0x18(undefined4 p_unknown, undefined4 p_unknown2) override; // vtable+0x18
+	virtual MxResult VTable0x20(MxDSAction* p_action) override;                        // vtable+0x20
+	virtual MxResult VTable0x24(undefined4 p_unknown) override;                        // vtable+0x24
+	virtual MxResult VTable0x28() override;                                            // vtable+0x28
+	virtual MxResult VTable0x30(undefined4 p_unknown) override;                        // vtable+0x30
+	virtual MxResult VTable0x34(undefined4 p_unknown);                                 // vtable+0x34
 
 	// FUNCTION: LEGO1 0x100c7360
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp
index f635b82a..b67fbacb 100644
--- a/LEGO1/mxdiskstreamprovider.cpp
+++ b/LEGO1/mxdiskstreamprovider.cpp
@@ -71,7 +71,7 @@ MxResult MxDiskStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 }
 
 // STUB: LEGO1 0x100d15e0
-void MxDiskStreamProvider::vtable0x20(undefined4 p_unknown1)
+void MxDiskStreamProvider::VTable0x20(undefined4 p_unknown1)
 {
 	// TODO
 }
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h
index 11b1d3c8..e9dff9c3 100644
--- a/LEGO1/mxdiskstreamprovider.h
+++ b/LEGO1/mxdiskstreamprovider.h
@@ -49,7 +49,7 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
 	virtual MxU32 GetFileSize() override;                                       // vtable+0x18
 	virtual MxU32 GetStreamBuffersNum() override;                               // vtable+0x1c
-	virtual void vtable0x20(undefined4 p_unknown1) override;                    // vtable+0x20
+	virtual void VTable0x20(undefined4 p_unknown1) override;                    // vtable+0x20
 	virtual MxU32 GetLengthInDWords() override;                                 // vtable+0x24
 	virtual MxU32* GetBufferForDWords() override;                               // vtable+0x28
 
diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/mxramstreamcontroller.cpp
index f97486c2..887db05a 100644
--- a/LEGO1/mxramstreamcontroller.cpp
+++ b/LEGO1/mxramstreamcontroller.cpp
@@ -36,14 +36,14 @@ MxResult MxRAMStreamController::Open(const char* p_filename)
 }
 
 // STUB: LEGO1 0x100c6210
-MxResult MxRAMStreamController::vtable0x20(MxDSAction* p_action)
+MxResult MxRAMStreamController::VTable0x20(MxDSAction* p_action)
 {
 	// TODO STUB
 	return FAILURE;
 }
 
 // FUNCTION: LEGO1 0x100c6320
-MxResult MxRAMStreamController::vtable0x24(MxDSAction* p_action)
+MxResult MxRAMStreamController::VTable0x24(MxDSAction* p_action)
 {
 	MxDSAction action;
 	do {
@@ -52,7 +52,7 @@ MxResult MxRAMStreamController::vtable0x24(MxDSAction* p_action)
 			m_action0x60 = NULL;
 		}
 		action = *p_action;
-		MxStreamController::vtable0x24(&action);
+		MxStreamController::VTable0x24(&action);
 	} while (m_action0x60 != NULL);
 	return SUCCESS;
 }
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index eb8eef1d..70e69d1b 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -25,8 +25,8 @@ class MxRAMStreamController : public MxStreamController {
 	}
 
 	virtual MxResult Open(const char* p_filename) override;
-	virtual MxResult vtable0x20(MxDSAction* p_action) override;
-	virtual MxResult vtable0x24(MxDSAction* p_action) override;
+	virtual MxResult VTable0x20(MxDSAction* p_action) override;
+	virtual MxResult VTable0x24(MxDSAction* p_action) override;
 
 private:
 	MxDSBuffer m_buffer;
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp
index 0c89dd18..34f63651 100644
--- a/LEGO1/mxstillpresenter.cpp
+++ b/LEGO1/mxstillpresenter.cpp
@@ -173,10 +173,10 @@ void MxStillPresenter::VTable0x88(MxS32 p_x, MxS32 p_y)
 		MxRect32 rect_b(m_location.m_x, m_location.m_y, width + m_location.m_x, height + m_location.m_y);
 
 		MVideoManager()->InvalidateRect(rect_a);
-		MVideoManager()->vtable0x34(rect_a.GetLeft(), rect_a.GetTop(), rect_a.GetWidth(), rect_a.GetHeight());
+		MVideoManager()->VTable0x34(rect_a.GetLeft(), rect_a.GetTop(), rect_a.GetWidth(), rect_a.GetHeight());
 
 		MVideoManager()->InvalidateRect(rect_b);
-		MVideoManager()->vtable0x34(rect_b.GetLeft(), rect_b.GetTop(), rect_b.GetWidth(), rect_b.GetHeight());
+		MVideoManager()->VTable0x34(rect_b.GetLeft(), rect_b.GetTop(), rect_b.GetWidth(), rect_b.GetHeight());
 	}
 }
 
@@ -193,7 +193,7 @@ void MxStillPresenter::Enable(MxBool p_enable)
 
 		MxRect32 rect(x, y, width + x, height + y);
 		MVideoManager()->InvalidateRect(rect);
-		MVideoManager()->vtable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
+		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
 }
 
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index b6e13843..3472fd49 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxStreamController, 0x64)
 DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14)
 
 // FUNCTION: LEGO1 0x100b9400
-MxResult MxStreamController::vtable0x18(undefined4 p_unknown, undefined4 p_unknown2)
+MxResult MxStreamController::VTable0x18(undefined4 p_unknown, undefined4 p_unknown2)
 {
 	return FAILURE;
 }
@@ -21,7 +21,7 @@ MxResult MxStreamController::vtable0x1C(undefined4 p_unknown, undefined4 p_unkno
 }
 
 // FUNCTION: LEGO1 0x100b9420
-MxResult MxStreamController::vtable0x28()
+MxResult MxStreamController::VTable0x28()
 {
 	return SUCCESS;
 }
@@ -96,7 +96,7 @@ MxResult MxStreamController::Open(const char* p_filename)
 }
 
 // FUNCTION: LEGO1 0x100c1690
-MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
+MxResult MxStreamController::VTable0x20(MxDSAction* p_action)
 {
 	MxAutoLocker locker(&m_criticalSection);
 
@@ -110,7 +110,7 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
 		offset = provider->GetBufferForDWords()[objectId];
 
 	if (offset)
-		result = vtable0x2c(p_action, offset);
+		result = VTable0x2c(p_action, offset);
 	else
 		result = FAILURE;
 
@@ -118,10 +118,10 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
 }
 
 // FUNCTION: LEGO1 0x100c1740
-MxResult MxStreamController::vtable0x24(MxDSAction* p_action)
+MxResult MxStreamController::VTable0x24(MxDSAction* p_action)
 {
 	MxAutoLocker locker(&m_criticalSection);
-	vtable0x30(p_action);
+	VTable0x30(p_action);
 	m_action0x60 = m_unk0xList0x54.Find(p_action, TRUE);
 	if (m_action0x60 == NULL) {
 		return FAILURE;
@@ -153,7 +153,7 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferva
 }
 
 // FUNCTION: LEGO1 0x100c1c10
-MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
+MxResult MxStreamController::VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
 {
 	MxAutoLocker locker(&m_criticalSection);
 	if (FUN_100c1a00(p_action, p_bufferval) != SUCCESS) {
@@ -163,7 +163,7 @@ MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
 }
 
 // FUNCTION: LEGO1 0x100c1ce0
-MxResult MxStreamController::vtable0x30(MxDSAction* p_unknown)
+MxResult MxStreamController::VTable0x30(MxDSAction* p_unknown)
 {
 	MxAutoLocker locker(&m_criticalSection);
 	MxResult result = FAILURE;
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index 998f832c..d62fcaa5 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -33,14 +33,14 @@ class MxStreamController : public MxCore {
 	}
 
 	virtual MxResult Open(const char* p_filename);                            // vtable+0x14
-	virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x18
+	virtual MxResult VTable0x18(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x18
 	virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x1c
-	virtual MxResult vtable0x20(MxDSAction* p_action);                        // vtable+0x20
-	virtual MxResult vtable0x24(MxDSAction* p_unknown);                       // vtable+0x24
+	virtual MxResult VTable0x20(MxDSAction* p_action);                        // vtable+0x20
+	virtual MxResult VTable0x24(MxDSAction* p_unknown);                       // vtable+0x24
 	MxResult FUN_100c1800(MxDSAction* p_action, MxU32 p_val);
-	virtual MxResult vtable0x28();                                        // vtable+0x28
-	virtual MxResult vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c
-	virtual MxResult vtable0x30(MxDSAction* p_unknown);                   // vtable+0x30
+	virtual MxResult VTable0x28();                                        // vtable+0x28
+	virtual MxResult VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c
+	virtual MxResult VTable0x30(MxDSAction* p_unknown);                   // vtable+0x30
 
 	MxBool FUN_100c20d0(MxDSObject& p_obj);
 	MxResult FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferval);
diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index 50f55331..6295460a 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -139,7 +139,7 @@ MxResult MxStreamer::FUN_100b99b0(MxDSAction* p_action)
 		if (controller == NULL) {
 			return FAILURE;
 		}
-		return controller->vtable0x20(p_action);
+		return controller->VTable0x20(p_action);
 	}
 	return FAILURE;
 }
diff --git a/LEGO1/mxstreamprovider.cpp b/LEGO1/mxstreamprovider.cpp
index f80788dc..c362a2d7 100644
--- a/LEGO1/mxstreamprovider.cpp
+++ b/LEGO1/mxstreamprovider.cpp
@@ -12,6 +12,6 @@ MxResult MxStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 }
 
 // FUNCTION: LEGO1 0x100d07d0
-void MxStreamProvider::vtable0x20(undefined4 p_unknown1)
+void MxStreamProvider::VTable0x20(undefined4 p_unknown1)
 {
 }
diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/mxstreamprovider.h
index 38a491f2..f27e3c27 100644
--- a/LEGO1/mxstreamprovider.h
+++ b/LEGO1/mxstreamprovider.h
@@ -28,7 +28,7 @@ class MxStreamProvider : public MxCore {
 	virtual MxResult SetResourceToGet(MxStreamController* p_resource); // vtable+0x14
 	virtual MxU32 GetFileSize() = 0;                                   // vtable+0x18
 	virtual MxU32 GetStreamBuffersNum() = 0;                           // vtable+0x1c
-	virtual void vtable0x20(undefined4 p_unknown1);                    // vtable+0x20
+	virtual void VTable0x20(undefined4 p_unknown1);                    // vtable+0x20
 	virtual MxU32 GetLengthInDWords() = 0;                             // vtable+0x24
 	virtual MxU32* GetBufferForDWords() = 0;                           // vtable+0x28
 
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp
index f7338e37..493f23ab 100644
--- a/LEGO1/mxvideomanager.cpp
+++ b/LEGO1/mxvideomanager.cpp
@@ -14,7 +14,7 @@ MxVideoManager::MxVideoManager()
 }
 
 // FUNCTION: LEGO1 0x100be270
-void MxVideoManager::vtable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
+void MxVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
 {
 }
 
@@ -115,7 +115,7 @@ void MxVideoManager::SortPresenterList()
 }
 
 // FUNCTION: LEGO1 0x100be600
-MxResult MxVideoManager::vtable0x28(
+MxResult MxVideoManager::VTable0x28(
 	MxVideoParam& p_videoParam,
 	LPDIRECTDRAW p_pDirectDraw,
 	LPDIRECTDRAWSURFACE p_pDDSurface,
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h
index 4558121c..6d03d84e 100644
--- a/LEGO1/mxvideomanager.h
+++ b/LEGO1/mxvideomanager.h
@@ -16,7 +16,7 @@ class MxVideoManager : public MxMediaManager {
 
 	virtual MxResult Tickle() override; // vtable+0x8
 	virtual void Destroy() override;    // vtable+0x18
-	virtual MxResult vtable0x28(
+	virtual MxResult VTable0x28(
 		MxVideoParam& p_videoParam,
 		LPDIRECTDRAW p_pDirectDraw,
 		LPDIRECTDRAWSURFACE p_pDDSurface,
@@ -30,7 +30,7 @@ class MxVideoManager : public MxMediaManager {
 
 	__declspec(dllexport) void InvalidateRect(MxRect32&);
 	__declspec(dllexport) virtual MxResult RealizePalette(MxPalette*);            // vtable+0x30
-	virtual void vtable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34
+	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34
 
 	MxResult Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index da7dfc07..e6bbc9b9 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -222,7 +222,7 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 		MxRect32 rect(x, y, x + width, y + height);
 
 		MVideoManager()->InvalidateRect(rect);
-		MVideoManager()->vtable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
+		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
 
 	delete m_bitmap;