diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 67f53b82..66f13462 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -389,7 +389,7 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event)
 		break;
 	}
 
-	if (event->user.type == g_LegoSdlEvents.windows_message) {
+	if (event->user.type == g_legoSdlEvents.m_windowsMessage) {
 		switch (event->user.code) {
 		case WM_ISLE_SETCURSOR:
 			g_isle->SetupCursor((Cursor) (uintptr_t) event->user.data1);
diff --git a/LEGO1/lego/legoomni/include/legomain.h b/LEGO1/lego/legoomni/include/legomain.h
index 0fbbff44..6cec064a 100644
--- a/LEGO1/lego/legoomni/include/legomain.h
+++ b/LEGO1/lego/legoomni/include/legomain.h
@@ -191,7 +191,7 @@ class LegoOmni : public MxOmni {
 	void CloseMainWindow()
 	{
 		SDL_Event event;
-		event.user.type = g_LegoSdlEvents.windows_message;
+		event.user.type = g_legoSdlEvents.m_windowsMessage;
 		event.user.code = WM_CLOSE;
 		event.user.data1 = NULL;
 		event.user.data2 = NULL;
diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h
index 8825f457..9d95f919 100644
--- a/LEGO1/lego/legoomni/include/legoutils.h
+++ b/LEGO1/lego/legoomni/include/legoutils.h
@@ -16,10 +16,10 @@
 #define DS_NOT_A_STREAM -1
 
 struct LegoSdlEvents {
-	Uint32 windows_message;
+	Uint32 m_windowsMessage;
 };
 
-LEGO1_EXPORT extern LegoSdlEvents g_LegoSdlEvents;
+LEGO1_EXPORT extern LegoSdlEvents g_legoSdlEvents;
 
 enum Cursor {
 	e_cursorArrow = 0,
diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp
index c258105c..b8f76c6f 100644
--- a/LEGO1/lego/legoomni/src/common/legoutils.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <vec.h>
 
-LegoSdlEvents g_LegoSdlEvents;
+LegoSdlEvents g_legoSdlEvents;
 
 // FUNCTION: LEGO1 0x1003dd70
 // FUNCTION: BETA10 0x100d3410
@@ -569,11 +569,12 @@ void EnableAnimations(MxBool p_enable)
 
 void InitSdlEvents()
 {
-	static bool initialized = false;
-	if (!initialized) {
-		initialized = true;
+	static bool g_initialized = false;
+
+	if (!g_initialized) {
+		g_initialized = true;
 		Uint32 event = SDL_RegisterEvents(1);
-		g_LegoSdlEvents.windows_message = event + 0;
+		g_legoSdlEvents.m_windowsMessage = event + 0;
 	}
 }
 
@@ -581,7 +582,7 @@ void InitSdlEvents()
 void SetAppCursor(Cursor p_cursor)
 {
 	SDL_Event event;
-	event.user.type = g_LegoSdlEvents.windows_message;
+	event.user.type = g_legoSdlEvents.m_windowsMessage;
 	event.user.code = WM_ISLE_SETCURSOR;
 	event.user.data1 = (void*) p_cursor;
 	SDL_PushEvent(&event);
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index dd040f88..b855e116 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -516,9 +516,9 @@ MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
 
 static Uint32 SDLCALL LegoInputManagerTimerCallback(void* userdata, SDL_TimerID timerID, Uint32 interval)
 {
-	LegoInputManager* input_manager = (LegoInputManager*) userdata;
+	LegoInputManager* inputManager = (LegoInputManager*) userdata;
 	SDL_Event event;
-	event.type = g_LegoSdlEvents.windows_message;
+	event.type = g_legoSdlEvents.m_windowsMessage;
 	event.user.code = WM_TIMER;
 	event.user.data1 = (void*) (uintptr_t) timerID;
 	event.user.data2 = NULL;