diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index cfe7ffa4..1572423f 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -61,7 +61,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	MxDevice* device = NULL;
 	MxResult result = FAILURE;
 
-	MxDeviceEnumerate100d9cc8 deviceEnumerator;
+	MxDeviceEnumerate100d9cc8 deviceEnumerate;
 	Vector3Data posVec(0.0, 1.25, -50.0);
 	Vector3Data dirVec(0.0, 0.0, 1.0);
 	Vector3Data upVec(0.0, 1.0, 0.0);
@@ -85,24 +85,24 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	if (CreateDirect3D() != SUCCESS)
 		goto done;
 
-	if (deviceEnumerator.DoEnumerate() != SUCCESS)
+	if (deviceEnumerate.DoEnumerate() != SUCCESS)
 		goto done;
 
 	if (p_videoParam.GetDeviceName()) {
-		deviceNum = deviceEnumerator.ParseDeviceName(p_videoParam.GetDeviceName());
+		deviceNum = deviceEnumerate.ParseDeviceName(p_videoParam.GetDeviceName());
 		if (deviceNum >= 0) {
-			if ((deviceNum = deviceEnumerator.GetDevice(deviceNum, driver, device)) != SUCCESS)
+			if ((deviceNum = deviceEnumerate.GetDevice(deviceNum, driver, device)) != SUCCESS)
 				deviceNum = -1;
 		}
 	}
 
 	if (deviceNum < 0) {
-		deviceEnumerator.FUN_1009d210();
-		deviceNum = deviceEnumerator.FUN_1009d0d0();
-		deviceEnumerator.GetDevice(deviceNum, driver, device);
+		deviceEnumerate.FUN_1009d210();
+		deviceNum = deviceEnumerate.FUN_1009d0d0();
+		deviceEnumerate.GetDevice(deviceNum, driver, device);
 	}
 
-	m_direct3d->SetDevice(deviceEnumerator, driver, device);
+	m_direct3d->SetDevice(deviceEnumerate, driver, device);
 
 	if (!driver->m_ddCaps.dwCaps2 && driver->m_ddCaps.dwSVBRops[7] != 2)
 		p_videoParam.Flags().SetF2bit0(TRUE);
diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 5a8622ef..3556a929 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -126,7 +126,7 @@ BOOL MxDirect3D::D3DSetMode()
 }
 
 // FUNCTION: LEGO1 0x1009b5f0
-BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_driver, MxDevice* p_device)
+BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device)
 {
 	if (m_assignedDevice) {
 		delete m_assignedDevice;
@@ -137,7 +137,7 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_dr
 	MxAssignedDevice* assignedDevice = new MxAssignedDevice;
 	MxS32 i = 0;
 
-	for (list<MxDriver>::iterator it = p_deviceEnumerator.m_list.begin(); it != p_deviceEnumerator.m_list.end(); it++) {
+	for (list<MxDriver>::iterator it = p_deviceEnumerate.m_list.begin(); it != p_deviceEnumerate.m_list.end(); it++) {
 		MxDriver& driver = *it;
 
 		if (&driver == p_driver) {
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 9ae4dfd7..4ba5fc07 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -57,7 +57,7 @@ class MxDirect3D : public MxDirectDraw {
 
 	BOOL CreateIDirect3D();
 	BOOL D3DSetMode();
-	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_driver, MxDevice* p_device);
+	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
 
 	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; };
 	inline IDirect3D* GetDirect3D() { return this->m_pDirect3d; }