diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad059d9b..d791fb09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ add_library(omni STATIC
   LEGO1/omni/src/stream/mxdsfile.cpp
   LEGO1/omni/src/stream/mxdssource.cpp
   LEGO1/omni/src/stream/mxdssubscriber.cpp
-  LEGO1/omni/src/stream/mxioinfo.cpp
+  LEGO1/omni/src/stream/mxio.cpp
   LEGO1/omni/src/stream/mxramstreamcontroller.cpp
   LEGO1/omni/src/stream/mxramstreamprovider.cpp
   LEGO1/omni/src/stream/mxstreamchunk.cpp
diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
index b635c896..bd4c74a1 100644
--- a/LEGO1/omni/include/mxdsfile.h
+++ b/LEGO1/omni/include/mxdsfile.h
@@ -2,7 +2,7 @@
 #define MXDSFILE_H
 
 #include "mxdssource.h"
-#include "mxioinfo.h"
+#include "mxio.h"
 #include "mxstring.h"
 #include "mxtypes.h"
 
diff --git a/LEGO1/omni/include/mxioinfo.h b/LEGO1/omni/include/mxio.h
similarity index 91%
rename from LEGO1/omni/include/mxioinfo.h
rename to LEGO1/omni/include/mxio.h
index 7fc3c343..e129ab5d 100644
--- a/LEGO1/omni/include/mxioinfo.h
+++ b/LEGO1/omni/include/mxio.h
@@ -1,5 +1,5 @@
-#ifndef MXIOINFO_H
-#define MXIOINFO_H
+#ifndef MXIO_H
+#define MXIO_H
 
 #include "mxtypes.h"
 
@@ -29,4 +29,4 @@ class MXIOINFO {
 	MMIOINFO m_info;
 };
 
-#endif // MXIOINFO_H
+#endif // MXIO_H
diff --git a/LEGO1/omni/include/mxutilities.h b/LEGO1/omni/include/mxutilities.h
index 801ca3c1..5959518c 100644
--- a/LEGO1/omni/include/mxutilities.h
+++ b/LEGO1/omni/include/mxutilities.h
@@ -1,5 +1,5 @@
-#ifndef MXUTIL_H
-#define MXUTIL_H
+#ifndef MXUTILITIES_H
+#define MXUTILITIES_H
 
 #include "mxtypes.h"
 
@@ -77,7 +77,6 @@ void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32));
 MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter);
 void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
 MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
-
 MxBool KeyValueStringParse(char*, const char*, const char*);
 
-#endif // MXUTIL_H
+#endif // MXUTILITIES_H
diff --git a/LEGO1/omni/src/stream/mxioinfo.cpp b/LEGO1/omni/src/stream/mxio.cpp
similarity index 99%
rename from LEGO1/omni/src/stream/mxioinfo.cpp
rename to LEGO1/omni/src/stream/mxio.cpp
index ec666c31..e2e6e723 100644
--- a/LEGO1/omni/src/stream/mxioinfo.cpp
+++ b/LEGO1/omni/src/stream/mxio.cpp
@@ -1,4 +1,4 @@
-#include "mxioinfo.h"
+#include "mxio.h"
 
 #include "decomp.h"