diff --git a/CMakeLists.txt b/CMakeLists.txt
index 286e3b1a..6485e070 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,7 @@ function(add_lego_libraries NAME)
     LEGO1/omni/src/common/mxcore.cpp
     LEGO1/omni/src/common/mxstring.cpp
     LEGO1/omni/src/audio/mxsoundmanager.cpp
-    LEGO1/omni/src/main/mxomni.cpp
+    LEGO1/omni/src/main/mxmain.cpp
     LEGO1/omni/src/notify/mxactionnotificationparam.cpp
     LEGO1/omni/src/main/mxomnicreateflags.cpp
     LEGO1/omni/src/main/mxomnicreateparam.cpp
diff --git a/LEGO1/lego/legoomni/include/legomain.h b/LEGO1/lego/legoomni/include/legomain.h
index 0fe040e3..5abf8a15 100644
--- a/LEGO1/lego/legoomni/include/legomain.h
+++ b/LEGO1/lego/legoomni/include/legomain.h
@@ -3,7 +3,7 @@
 
 #include "compat.h"
 #include "mxdsaction.h"
-#include "mxomni.h"
+#include "mxmain.h"
 
 class Isle;
 class LegoAnimationManager;
diff --git a/LEGO1/lego/legoomni/src/audio/lego3dsound.cpp b/LEGO1/lego/legoomni/src/audio/lego3dsound.cpp
index 81112ea8..7d4dc478 100644
--- a/LEGO1/lego/legoomni/src/audio/lego3dsound.cpp
+++ b/LEGO1/lego/legoomni/src/audio/lego3dsound.cpp
@@ -5,7 +5,7 @@
 #include "legosoundmanager.h"
 #include "legovideomanager.h"
 #include "misc.h"
-#include "mxomni.h"
+#include "mxmain.h"
 
 #include <vec.h>
 
diff --git a/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp b/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
index 8083822e..97aa669a 100644
--- a/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
@@ -2,7 +2,7 @@
 
 #include "mxcompositepresenter.h"
 #include "mxdsaction.h"
-#include "mxomni.h"
+#include "mxmain.h"
 
 DECOMP_SIZE_ASSERT(Lego3DWavePresenter, 0xa0)
 
diff --git a/LEGO1/lego/legoomni/src/audio/legocachsound.cpp b/LEGO1/lego/legoomni/src/audio/legocachsound.cpp
index 27961810..5e1b731e 100644
--- a/LEGO1/lego/legoomni/src/audio/legocachsound.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legocachsound.cpp
@@ -2,7 +2,7 @@
 
 #include "legosoundmanager.h"
 #include "misc.h"
-#include "mxomni.h"
+#include "mxmain.h"
 
 #include <assert.h>
 
diff --git a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
index a8bf9a07..2c52a1e6 100644
--- a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
@@ -2,7 +2,7 @@
 
 #include "legocachesoundmanager.h"
 #include "mxautolock.h"
-#include "mxomni.h"
+#include "mxmain.h"
 
 #include <assert.h>
 
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxmain.h
similarity index 98%
rename from LEGO1/omni/include/mxomni.h
rename to LEGO1/omni/include/mxmain.h
index bb8a54e9..035779af 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxmain.h
@@ -1,5 +1,5 @@
-#ifndef MXOMNI_H
-#define MXOMNI_H
+#ifndef MXMAIN_H
+#define MXMAIN_H
 
 #include "mxcore.h"
 #include "mxcriticalsection.h"
@@ -120,4 +120,4 @@ protected:
 	MxBool m_paused;                              // 0x64
 };
 
-#endif // MXOMNI_H
+#endif // MXMAIN_H
diff --git a/LEGO1/omni/src/audio/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp
index 5bfa851c..660bda0d 100644
--- a/LEGO1/omni/src/audio/mxsoundmanager.cpp
+++ b/LEGO1/omni/src/audio/mxsoundmanager.cpp
@@ -2,8 +2,8 @@
 
 #include "mxautolock.h"
 #include "mxdsaction.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 #include "mxticklethread.h"
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index ca55f73b..2b782da7 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -5,8 +5,8 @@
 #include "mxautolock.h"
 #include "mxdssound.h"
 #include "mxdssubscriber.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxsoundmanager.h"
 #include "mxutilities.h"
 
diff --git a/LEGO1/omni/src/common/mxatom.cpp b/LEGO1/omni/src/common/mxatom.cpp
index e242ebb0..942346ec 100644
--- a/LEGO1/omni/src/common/mxatom.cpp
+++ b/LEGO1/omni/src/common/mxatom.cpp
@@ -1,8 +1,8 @@
 #include "mxatom.h"
 
 #include "decomp.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 
 #include <assert.h>
 
diff --git a/LEGO1/omni/src/common/mxmisc.cpp b/LEGO1/omni/src/common/mxmisc.cpp
index 8dbab329..49f5551a 100644
--- a/LEGO1/omni/src/common/mxmisc.cpp
+++ b/LEGO1/omni/src/common/mxmisc.cpp
@@ -1,6 +1,6 @@
 #include "mxmisc.h"
 
-#include "mxomni.h"
+#include "mxmain.h"
 
 #include <assert.h>
 
diff --git a/LEGO1/omni/src/common/mxpresentationmanager.cpp b/LEGO1/omni/src/common/mxpresentationmanager.cpp
index 6ef8448e..e4d96fb3 100644
--- a/LEGO1/omni/src/common/mxpresentationmanager.cpp
+++ b/LEGO1/omni/src/common/mxpresentationmanager.cpp
@@ -2,7 +2,7 @@
 
 #include "decomp.h"
 #include "mxautolock.h"
-#include "mxomni.h"
+#include "mxmain.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index a2084656..9f297d9e 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -13,11 +13,11 @@
 #include "mxloopingflcpresenter.h"
 #include "mxloopingmidipresenter.h"
 #include "mxloopingsmkpresenter.h"
+#include "mxmain.h"
 #include "mxmidipresenter.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
-#include "mxomni.h"
 #include "mxparam.h"
 #include "mxsmkpresenter.h"
 #include "mxstillpresenter.h"
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxmain.cpp
similarity index 99%
rename from LEGO1/omni/src/main/mxomni.cpp
rename to LEGO1/omni/src/main/mxmain.cpp
index 0cd04266..530154ec 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxmain.cpp
@@ -1,4 +1,4 @@
-#include "mxomni.h"
+#include "mxmain.h"
 
 #include "mxactionnotificationparam.h"
 #include "mxatom.h"
@@ -85,8 +85,6 @@ void MxOmni::SetInstance(MxOmni* p_instance)
 // FUNCTION: BETA10 0x1012f3ff
 MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 {
-	// TODO: File name is MxMain.cpp according to BETA10
-
 	MxResult result = FAILURE;
 
 	if (!(m_atomSet = new MxAtomSet())) {
diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
index 0e34ed5a..04f06b63 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
@@ -4,8 +4,8 @@
 #include "mxautolock.h"
 #include "mxdiskstreamprovider.h"
 #include "mxdsstreamingaction.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxticklemanager.h"
 
 #include <assert.h>
diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
index 3eee3477..de16f38c 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
@@ -5,7 +5,7 @@
 #include "mxdsbuffer.h"
 #include "mxdsfile.h"
 #include "mxdsstreamingaction.h"
-#include "mxomni.h"
+#include "mxmain.h"
 #include "mxramstreamprovider.h"
 #include "mxstreamcontroller.h"
 #include "mxstring.h"
diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
index a73be62f..c3724347 100644
--- a/LEGO1/omni/src/stream/mxdsbuffer.cpp
+++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp
@@ -3,8 +3,8 @@
 #include "mxdiskstreamcontroller.h"
 #include "mxdschunk.h"
 #include "mxdsstreamingaction.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxstreamchunk.h"
 #include "mxstreamcontroller.h"
 #include "mxstreamer.h"
diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
index ddc25470..2cd707e4 100644
--- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
@@ -3,7 +3,7 @@
 #include "decomp.h"
 #include "mxdsbuffer.h"
 #include "mxdsfile.h"
-#include "mxomni.h"
+#include "mxmain.h"
 #include "mxstreamcontroller.h"
 
 DECOMP_SIZE_ASSERT(MxStreamProvider, 0x10)
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 6b6f4ce5..8200f478 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -2,8 +2,8 @@
 
 #include "mxbitmap.h"
 #include "mxdebug.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxpalette.h"
 #include "mxutilities.h"
 #include "mxvideomanager.h"
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index db2f2ebb..8574e3eb 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -6,8 +6,8 @@
 #include "mxdisplaysurface.h"
 #include "mxdsmediaaction.h"
 #include "mxdssubscriber.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxpalette.h"
 #include "mxutilities.h"
 #include "mxvideomanager.h"
diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
index 7062c694..7194e453 100644
--- a/LEGO1/omni/src/video/mxvideomanager.cpp
+++ b/LEGO1/omni/src/video/mxvideomanager.cpp
@@ -2,8 +2,8 @@
 
 #include "mxautolock.h"
 #include "mxdisplaysurface.h"
+#include "mxmain.h"
 #include "mxmisc.h"
-#include "mxomni.h"
 #include "mxpalette.h"
 #include "mxpresenter.h"
 #include "mxregion.h"