diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f6d1746..286e3b1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ function(add_lego_libraries NAME)
     LEGO1/omni/src/common/mxutilities.cpp
     LEGO1/omni/src/common/mxvariabletable.cpp
     LEGO1/omni/src/stream/mxdssubscriber.cpp
-    LEGO1/omni/src/common/mxmediamanager.cpp
+    LEGO1/omni/src/common/mxpresentationmanager.cpp
     LEGO1/omni/src/system/mxticklethread.cpp
     LEGO1/omni/src/audio/mxaudiomanager.cpp
     LEGO1/omni/src/system/mxautolock.cpp
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index c99badc6..bab1f553 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -2,12 +2,12 @@
 #define MXAUDIOMANAGER_H
 
 #include "decomp.h"
-#include "mxmediamanager.h"
+#include "mxpresentationmanager.h"
 
 // VTABLE: LEGO1 0x100dc6e0
 // VTABLE: BETA10 0x101c2348
 // SIZE 0x30
-class MxAudioManager : public MxMediaManager {
+class MxAudioManager : public MxPresentationManager {
 public:
 	MxAudioManager();
 	~MxAudioManager() override;
diff --git a/LEGO1/omni/include/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h
index b23a2ad0..f17f886d 100644
--- a/LEGO1/omni/include/mxeventmanager.h
+++ b/LEGO1/omni/include/mxeventmanager.h
@@ -2,11 +2,11 @@
 #define MXEVENTMANAGER_H
 
 #include "decomp.h"
-#include "mxmediamanager.h"
+#include "mxpresentationmanager.h"
 
 // VTABLE: LEGO1 0x100dc900
 // SIZE 0x2c
-class MxEventManager : public MxMediaManager {
+class MxEventManager : public MxPresentationManager {
 public:
 	MxEventManager();
 	~MxEventManager() override;
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxpresentationmanager.h
similarity index 77%
rename from LEGO1/omni/include/mxmediamanager.h
rename to LEGO1/omni/include/mxpresentationmanager.h
index a21e2956..f0740e6e 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxpresentationmanager.h
@@ -1,5 +1,5 @@
-#ifndef MXMEDIAMANGER_H
-#define MXMEDIAMANGER_H
+#ifndef MXPRESENTATIONMANAGER_H
+#define MXPRESENTATIONMANAGER_H
 
 #include "mxcore.h"
 #include "mxcriticalsection.h"
@@ -11,10 +11,10 @@ class MxThread;
 // VTABLE: LEGO1 0x100dc6b0
 // VTABLE: BETA10 0x101c2318
 // SIZE 0x2c
-class MxMediaManager : public MxCore {
+class MxPresentationManager : public MxCore {
 public:
-	MxMediaManager();
-	~MxMediaManager() override;
+	MxPresentationManager();
+	~MxPresentationManager() override;
 
 	MxResult Tickle() override;                                 // vtable+08
 	virtual MxResult Create();                                  // vtable+14
@@ -27,7 +27,7 @@ class MxMediaManager : public MxCore {
 
 	// SYNTHETIC: LEGO1 0x100b8540
 	// SYNTHETIC: BETA10 0x10144db0
-	// MxMediaManager::`scalar deleting destructor'
+	// MxPresentationManager::`scalar deleting destructor'
 
 protected:
 	MxPresenterList* m_presenters;       // 0x08
@@ -35,4 +35,4 @@ class MxMediaManager : public MxCore {
 	MxCriticalSection m_criticalSection; // 0x10
 };
 
-#endif // MXMEDIAMANGER_H
+#endif // MXPRESENTATIONMANAGER_H
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index b8dd72ea..60349d13 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -1,7 +1,7 @@
 #ifndef MXVIDEOMANAGER_H
 #define MXVIDEOMANAGER_H
 
-#include "mxmediamanager.h"
+#include "mxpresentationmanager.h"
 #include "mxvideoparam.h"
 
 #include <d3d.h>
@@ -13,7 +13,7 @@ class MxRegion;
 // VTABLE: LEGO1 0x100dc810
 // VTABLE: BETA10 0x101c1bf8
 // SIZE 0x64
-class MxVideoManager : public MxMediaManager {
+class MxVideoManager : public MxPresentationManager {
 public:
 	MxVideoManager();
 	~MxVideoManager() override;
diff --git a/LEGO1/omni/src/audio/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp
index 95e02968..3cef829a 100644
--- a/LEGO1/omni/src/audio/mxaudiomanager.cpp
+++ b/LEGO1/omni/src/audio/mxaudiomanager.cpp
@@ -37,7 +37,7 @@ void MxAudioManager::Destroy(MxBool p_fromDestructor)
 	m_criticalSection.Leave();
 
 	if (!p_fromDestructor) {
-		MxMediaManager::Destroy();
+		MxPresentationManager::Destroy();
 	}
 }
 
@@ -48,7 +48,7 @@ MxResult MxAudioManager::Create()
 	MxResult result = FAILURE;
 	MxBool success = FALSE;
 
-	if (MxMediaManager::Create() != SUCCESS) {
+	if (MxPresentationManager::Create() != SUCCESS) {
 		goto exit;
 	}
 
@@ -79,7 +79,7 @@ MxResult MxAudioManager::Create()
 	MxResult result = FAILURE;
 	MxBool success = FALSE;
 
-	if (MxMediaManager::Create() == SUCCESS) {
+	if (MxPresentationManager::Create() == SUCCESS) {
 		ENTER(m_criticalSection);
 		success = TRUE;
 		result = SUCCESS;
diff --git a/LEGO1/omni/src/common/mxmediamanager.cpp b/LEGO1/omni/src/common/mxpresentationmanager.cpp
similarity index 74%
rename from LEGO1/omni/src/common/mxmediamanager.cpp
rename to LEGO1/omni/src/common/mxpresentationmanager.cpp
index 2a15df2d..6ef8448e 100644
--- a/LEGO1/omni/src/common/mxmediamanager.cpp
+++ b/LEGO1/omni/src/common/mxpresentationmanager.cpp
@@ -1,4 +1,4 @@
-#include "mxmediamanager.h"
+#include "mxpresentationmanager.h"
 
 #include "decomp.h"
 #include "mxautolock.h"
@@ -6,27 +6,27 @@
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 
-DECOMP_SIZE_ASSERT(MxMediaManager, 0x2c);
+DECOMP_SIZE_ASSERT(MxPresentationManager, 0x2c);
 DECOMP_SIZE_ASSERT(MxPresenterList, 0x18);
 DECOMP_SIZE_ASSERT(MxPresenterListCursor, 0x10);
 
 // FUNCTION: LEGO1 0x100b84c0
 // FUNCTION: BETA10 0x10144680
-MxMediaManager::MxMediaManager()
+MxPresentationManager::MxPresentationManager()
 {
 	Init();
 }
 
 // FUNCTION: LEGO1 0x100b8560
 // FUNCTION: BETA10 0x10144712
-MxMediaManager::~MxMediaManager()
+MxPresentationManager::~MxPresentationManager()
 {
 	Destroy();
 }
 
 // FUNCTION: LEGO1 0x100b85d0
 // FUNCTION: BETA10 0x1014479b
-MxResult MxMediaManager::Init()
+MxResult MxPresentationManager::Init()
 {
 	this->m_presenters = NULL;
 	this->m_thread = NULL;
@@ -35,8 +35,9 @@ MxResult MxMediaManager::Init()
 
 // FUNCTION: LEGO1 0x100b85e0
 // FUNCTION: BETA10 0x101447c5
-MxResult MxMediaManager::Create()
+MxResult MxPresentationManager::Create()
 {
+	// This validates the name of the source code file (and hence also the name of the class)
 	AUTOLOCK(m_criticalSection);
 
 	this->m_presenters = new MxPresenterList;
@@ -51,7 +52,7 @@ MxResult MxMediaManager::Create()
 
 // FUNCTION: LEGO1 0x100b8710
 // FUNCTION: BETA10 0x101448e4
-void MxMediaManager::Destroy()
+void MxPresentationManager::Destroy()
 {
 	AUTOLOCK(m_criticalSection);
 
@@ -64,7 +65,7 @@ void MxMediaManager::Destroy()
 
 // FUNCTION: LEGO1 0x100b8790
 // FUNCTION: BETA10 0x10144993
-MxResult MxMediaManager::Tickle()
+MxResult MxPresentationManager::Tickle()
 {
 	AUTOLOCK(m_criticalSection);
 	MxPresenter* presenter;
@@ -85,7 +86,7 @@ MxResult MxMediaManager::Tickle()
 
 // FUNCTION: LEGO1 0x100b88c0
 // FUNCTION: BETA10 0x10144a8b
-void MxMediaManager::RegisterPresenter(MxPresenter& p_presenter)
+void MxPresentationManager::RegisterPresenter(MxPresenter& p_presenter)
 {
 	AUTOLOCK(m_criticalSection);
 
@@ -94,7 +95,7 @@ void MxMediaManager::RegisterPresenter(MxPresenter& p_presenter)
 
 // FUNCTION: LEGO1 0x100b8980
 // FUNCTION: BETA10 0x10144b0c
-void MxMediaManager::UnregisterPresenter(MxPresenter& p_presenter)
+void MxPresentationManager::UnregisterPresenter(MxPresenter& p_presenter)
 {
 	AUTOLOCK(m_criticalSection);
 	MxPresenterListCursor cursor(this->m_presenters);
@@ -106,7 +107,7 @@ void MxMediaManager::UnregisterPresenter(MxPresenter& p_presenter)
 
 // FUNCTION: LEGO1 0x100b8ac0
 // FUNCTION: BETA10 0x10144bc3
-void MxMediaManager::StopPresenters()
+void MxPresentationManager::StopPresenters()
 {
 	AUTOLOCK(m_criticalSection);
 	MxPresenter* presenter;
diff --git a/LEGO1/omni/src/event/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp
index 2c38a123..91a22abb 100644
--- a/LEGO1/omni/src/event/mxeventmanager.cpp
+++ b/LEGO1/omni/src/event/mxeventmanager.cpp
@@ -35,7 +35,7 @@ void MxEventManager::Destroy(MxBool p_fromDestructor)
 	}
 
 	if (!p_fromDestructor) {
-		MxMediaManager::Destroy();
+		MxPresentationManager::Destroy();
 	}
 }
 
@@ -45,7 +45,7 @@ MxResult MxEventManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 	MxResult status = FAILURE;
 	MxBool locked = FALSE;
 
-	MxResult result = MxMediaManager::Create();
+	MxResult result = MxPresentationManager::Create();
 	if (result == SUCCESS) {
 		if (p_createThread) {
 			ENTER(this->m_criticalSection);
diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
index 7a4f5411..5649e2d1 100644
--- a/LEGO1/omni/src/video/mxvideomanager.cpp
+++ b/LEGO1/omni/src/video/mxvideomanager.cpp
@@ -83,7 +83,7 @@ void MxVideoManager::Destroy(MxBool p_fromDestructor)
 	m_criticalSection.Leave();
 
 	if (!p_fromDestructor) {
-		MxMediaManager::Destroy();
+		MxPresentationManager::Destroy();
 	}
 }
 
@@ -153,7 +153,7 @@ MxResult MxVideoManager::VTable0x28(
 
 	m_unk0x60 = FALSE;
 
-	if (MxMediaManager::Create() != SUCCESS) {
+	if (MxPresentationManager::Create() != SUCCESS) {
 		goto done;
 	}
 
@@ -227,7 +227,7 @@ MxResult MxVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS,
 
 	m_unk0x60 = TRUE;
 
-	if (MxMediaManager::Create() != SUCCESS) {
+	if (MxPresentationManager::Create() != SUCCESS) {
 		goto done;
 	}