17 files changed, 48 insertions, 49 deletions

diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 83c1742a..df47e9b5 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -117,8 +117,8 @@ GetModelFromName(const char *name)
 	char playername[32];
 
 	if(strncasecmp(name, "CSplay", 6) == 0 &&
-	   strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetName(), "ig", 2) == 0){
-		strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetName());
+	   strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName(), "ig", 2) == 0){
+		strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName());
 		playername[0] = 'C';
 		playername[1] = 'S';
 		name = playername;
@@ -127,7 +127,7 @@ GetModelFromName(const char *name)
 	for(i = 0; i < MODELINFOSIZE; i++){
 		mi = CModelInfo::GetModelInfo(i);
 		if(mi && mi->GetRwObject() && RwObjectGetType(mi->GetRwObject()) == rpCLUMP &&
-		   strcmpIgnoringDigits(mi->GetName(), name))
+		   strcmpIgnoringDigits(mi->GetModelName(), name))
 			return mi;
 	}
 	return nil;
@@ -149,7 +149,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name)
 		CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(animBlock->firstIndex + i);
 		CBaseModelInfo *model = GetModelFromName(anim->name);
 		if(model){
-			debug("Associated anim %s with model %s\n", anim->name, model->GetName());
+			debug("Associated anim %s with model %s\n", anim->name, model->GetModelName());
 			RpClump *clump = (RpClump*)model->CreateInstance();
 			RpAnimBlendClumpInit(clump);
 			assocList[i].Init(clump, anim);
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index 003385da..eeec2728 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -383,7 +383,7 @@ CCutsceneMgr::CreateCutsceneObject(int modelId)
 	CCutsceneObject *pCutsceneObject;
 
 	CStreaming::ImGonnaUseStreamingMemory();
-	debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetName());
+	debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetModelName());
 	if (modelId >= MI_CUTOBJ01 && modelId <= MI_CUTOBJ05) {
 		pModelInfo = CModelInfo::GetModelInfo(modelId);
 		pColModel = &CTempColModels::ms_colModelCutObj[modelId - MI_CUTOBJ01];
@@ -569,7 +569,7 @@ CCutsceneMgr::AttachObjectToParent(CObject *pObject, CEntity *pAttachTo)
 	((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
 	((CCutsceneObject*)pObject)->m_pAttachTo = RpClumpGetFrame(pAttachTo->GetClump());
 
-	debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
+	debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
 }
 
 void
@@ -578,9 +578,9 @@ CCutsceneMgr::AttachObjectToFrame(CObject *pObject, CEntity *pAttachTo, const ch
 	((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
 	((CCutsceneObject*)pObject)->m_pAttachTo = RpAnimBlendClumpFindFrame(pAttachTo->GetClump(), frame)->frame;
 	debug("Attach %s to component %s of %s\n",
-		CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(),
+		CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
 		frame,
-		CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
+		CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
 	if (RwObjectGetType(pObject->m_rwObject) == rpCLUMP) {
 		RpClump *clump = (RpClump*)pObject->m_rwObject;
 		if (IsClumpSkinned(clump))
@@ -597,8 +597,8 @@ CCutsceneMgr::AttachObjectToBone(CObject *pObject, CObject *pAttachTo, int bone)
 	((CCutsceneObject*)pObject)->m_pAttachmentObject = pAttachTo;
 	((CCutsceneObject*)pObject)->m_pAttachTo = &matrixArray[id];
 	debug("Attach %s to %s\n",
-		CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(),
-		CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
+		CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
+		CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
 }
 
 void
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index 822a70a8..f970cf89 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -2759,7 +2759,7 @@ void CTheScripts::UpdateObjectIndices()
 			CBaseModelInfo* pModel = CModelInfo::GetModelInfo(j);
 			if (!pModel)
 				continue;
-			strcpy(name, pModel->GetName());
+			strcpy(name, pModel->GetModelName());
 #ifdef FIX_BUGS
 			for (int k = 0; k < USED_OBJECT_NAME_LENGTH && name[k]; k++)
 #else
diff --git a/src/control/Script7.cpp b/src/control/Script7.cpp
index 1eaa6cd0..5a70fd28 100644
--- a/src/control/Script7.cpp
+++ b/src/control/Script7.cpp
@@ -625,7 +625,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 			key[i] = tolower(key[i]);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		script_assert(pPed);
-		UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetName()) == 0);
+		UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetModelName()) == 0);
 		return 0;
 	}
 	case COMMAND_SET_PLAYER_CAN_DO_DRIVE_BY:
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 9aaba611..b8201400 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -492,7 +492,7 @@ bool
 CFileLoader::StartLoadClumpFile(RwStream *stream, uint32 id)
 {
 	if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
-		printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetName());
+		printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
 		return RpClumpGtaStreamRead1(stream);
 	}else{
 		printf("FAILED\n");
@@ -506,7 +506,7 @@ CFileLoader::FinishLoadClumpFile(RwStream *stream, uint32 id)
 	RpClump *clump;
 	CClumpModelInfo *mi;
 
-	printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetName());
+	printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
 	clump = RpClumpGtaStreamRead2(stream);
 
 	if(clump){
@@ -739,7 +739,7 @@ CFileLoader::LoadObject(const char *line)
 	}
 
 	mi = CModelInfo::AddSimpleModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetNumAtomics(numObjs);
 	mi->SetLodDistances(dist);
 	SetModelInfoFlags(mi, flags);
@@ -787,7 +787,7 @@ CFileLoader::LoadTimeObject(const char *line)
 	}
 
 	mi = CModelInfo::AddTimeModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetNumAtomics(numObjs);
 	mi->SetLodDistances(dist);
 	SetModelInfoFlags(mi, flags);
@@ -813,7 +813,7 @@ CFileLoader::LoadWeaponObject(const char *line)
 	sscanf(line, "%d %s %s %s %d %f", &id, model, txd, animFile, &numObjs, &dist);
 
 	mi = CModelInfo::AddWeaponModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetNumAtomics(1);
 	mi->m_lodDistances[0] = dist;
 	mi->SetTexDictionary(txd);
@@ -832,7 +832,7 @@ CFileLoader::LoadClumpObject(const char *line)
 
 	if(sscanf(line, "%d %s %s", &id, model, txd) == 3){
 		mi = CModelInfo::AddClumpModel(id);
-		mi->SetName(model);
+		mi->SetModelName(model);
 		mi->SetTexDictionary(txd);
 		mi->SetColModel(&CTempColModels::ms_colModelBBox);
 	}
@@ -856,7 +856,7 @@ CFileLoader::LoadVehicleObject(const char *line)
 		&frequency, &level, &comprules, &misc, &wheelScale);
 
 	mi = CModelInfo::AddVehicleModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetTexDictionary(txd);
 	mi->SetAnimFile(animFile);
 	for(p = gamename; *p; p++)
@@ -935,7 +935,7 @@ CFileLoader::LoadPedObject(const char *line)
 		  animFile, &radio1, &radio2);
 
 	mi = CModelInfo::AddPedModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetTexDictionary(txd);
 	mi->SetAnimFile(animFile);
 	mi->SetColModel(&CTempColModels::ms_colModelPed1);
@@ -1205,7 +1205,7 @@ CFileLoader::LoadObjectInstance(const char *line)
 	assert(mi->IsSimple());
 
 	if(!CStreaming::IsObjectInCdImage(id))
-		debug("Not in cdimage %s\n", mi->GetName());
+		debug("Not in cdimage %s\n", mi->GetModelName());
 
 	angle = -RADTODEG(2.0f * acosf(angle));
 	xform = RwMatrixCreate();
@@ -1438,7 +1438,7 @@ CFileLoader::ReloadObject(const char *line)
 #ifdef FIX_BUGS
 		mi &&
 #endif
-	    mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetName(), model) && mi->m_numAtomics == numObjs) {
+	    mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetModelName(), model) && mi->m_numAtomics == numObjs) {
 		mi->SetLodDistances(dist);
 		SetModelInfoFlags(mi, flags);
 	} else {
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index b27cccb5..4a812b05 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -661,8 +661,8 @@ public:
 	int32 m_nSelectedScreenMode;
 #endif
 #ifdef MULTISAMPLING
-	static int8 m_nPrefsMSAALevel;
-	static int8 m_nDisplayMSAALevel;
+	int8 m_nPrefsMSAALevel;
+	int8 m_nDisplayMSAALevel;
 #endif
 
 	enum LANGUAGE
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index dfc7a82f..ee60f316 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -536,7 +536,7 @@ INITSAVEBUF
 #endif
 			CopyToBuf(buf, CWanted::MaximumWantedLevel);
 			CopyToBuf(buf, CWanted::nMaximumWantedLevel);
-			memcpy(buf, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetName(), MAX_MODEL_NAME);
+			memcpy(buf, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetModelName(), MAX_MODEL_NAME);
 			SkipSaveBuf(buf, MAX_MODEL_NAME);
 		}
 	}
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 8a75b636..ec0e8e93 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -482,7 +482,7 @@ GetObjectName(int streamId)
 {
 	static char objname[32];
 	if(streamId < STREAM_OFFSET_TXD)
-		sprintf(objname, "%s.dff", CModelInfo::GetModelInfo(streamId)->GetName());
+		sprintf(objname, "%s.dff", CModelInfo::GetModelInfo(streamId)->GetModelName());
 	else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL)
 		sprintf(objname, "%s.txd", CTxdStore::GetTxdName(streamId-STREAM_OFFSET_TXD));
 	else if(streamId >= STREAM_OFFSET_COL && streamId < STREAM_OFFSET_ANIM)
@@ -577,7 +577,7 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 		}
 
 		if(!success){
-			debug("Failed to load %s\n", CModelInfo::GetModelInfo(streamId)->GetName());
+			debug("Failed to load %s\n", CModelInfo::GetModelInfo(streamId)->GetModelName());
 			RemoveModel(streamId);
 			ReRequestModel(streamId);
 			RwStreamClose(stream, &mem);
@@ -990,7 +990,7 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
 
 	mi = CModelInfo::GetModelInfo(modelId);
 	if(strncasecmp("CSPlay", modelName, 6) == 0){
-		char *curname = CModelInfo::GetModelInfo(MI_PLAYER)->GetName();
+		char *curname = CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName();
 		for(int i = 0; CSnames[i][0]; i++){
 			if(strcasecmp(curname, IGnames[i]) == 0){
 				modelName = CSnames[i];
@@ -998,7 +998,7 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
 			}
 		}
 	}
-	if(!CGeneral::faststrcmp(mi->GetName(), modelName)){
+	if(!CGeneral::faststrcmp(mi->GetModelName(), modelName)){
 		// Already have the correct name, just request it
 		RequestModel(modelId, flags);
 		return;
@@ -1023,8 +1023,8 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
 		}
 	}
 
-	strcpy(oldName, mi->GetName());
-	mi->SetName(modelName);
+	strcpy(oldName, mi->GetModelName());
+	mi->SetModelName(modelName);
 
 	// What exactly is going on here?
 	if(CModelInfo::GetModelInfo(oldName, nil)){
@@ -1795,11 +1795,11 @@ CStreaming::StreamZoneModels(const CVector &pos)
 			int newMI = CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j];
 			if(newMI != oldMI){
 				RequestModel(newMI, STREAMFLAGS_DEPENDENCY);
-				debug("Request Ped %s\n", CModelInfo::GetModelInfo(newMI)->GetName());
+				debug("Request Ped %s\n", CModelInfo::GetModelInfo(newMI)->GetModelName());
 				if(ms_numPedsLoaded == MAXZONEPEDSLOADED){
 					SetModelIsDeletable(oldMI);
 					SetModelTxdIsDeletable(oldMI);
-					debug("Remove Ped %s\n", CModelInfo::GetModelInfo(oldMI)->GetName());
+					debug("Remove Ped %s\n", CModelInfo::GetModelInfo(oldMI)->GetModelName());
 				}else
 					ms_numPedsLoaded++;
 				timeBeforeNextLoad = 300;
@@ -3195,7 +3195,7 @@ CStreaming::PrintStreamingBufferState()
 						sprintf(str, "txd %s, refs %d, size %dK, flags 0x%x", CTxdStore::GetTxdName(modelIndex - STREAM_OFFSET_TXD),
 						        CTxdStore::GetNumRefs(modelIndex - STREAM_OFFSET_TXD), 2 * size, streamingInfo->m_flags);
 					else
-						sprintf(str, "model %d,%s, refs%d, size%dK, flags%x", modelIndex, modelInfo->GetName(), modelInfo->GetNumRefs(), 2 * size,
+						sprintf(str, "model %d,%s, refs%d, size%dK, flags%x", modelIndex, modelInfo->GetModelName(), modelInfo->GetNumRefs(), 2 * size,
 						        streamingInfo->m_flags);
 					AsciiToUnicode(str, wstr);
 					CFont::PrintString(24.0f, y, wstr);
diff --git a/src/core/config.h b/src/core/config.h
index 38ee9712..8e528a67 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -317,7 +317,7 @@ enum Config {
 #		define GRAPHICS_MENU_OPTIONS // otherwise Display settings will be scrollable
 #		define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
 #		define CUTSCENE_BORDERS_SWITCH
-//#		define MULTISAMPLING		// adds MSAA option
+#		define MULTISAMPLING		// adds MSAA option
 #		define INVERT_LOOK_FOR_PAD // enable the hidden option
 #	endif
 #endif
@@ -387,7 +387,6 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
 
 #ifdef LIBRW
 // these are not supported with librw yet
-#	undef MULTISAMPLING
 #endif
 // IMG
 #define BIG_IMG // allows to read larger img files
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 1073deb3..862d2562 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -626,7 +626,7 @@ CEntity::SetupBigBuilding(void)
 	if(mi->m_lodDistances[0] > 2500.0f || mi->m_ignoreDrawDist)
 		m_level = LEVEL_GENERIC;
 	else if(m_level == LEVEL_GENERIC)
-		printf("%s isn't in a level\n", mi->GetName());
+		printf("%s isn't in a level\n", mi->GetModelName());
 }
 
 float WindTabel[] = {
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 23ba5e66..a4906fc9 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -50,8 +50,8 @@ public:
 	bool IsBuilding(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
 	bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME || m_type == MITYPE_WEAPON; }
 	bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE;	}
-	char *GetName(void) { return m_name; }
-	void SetName(const char *name) { strncpy(m_name, name, MAX_MODEL_NAME); }
+	char *GetModelName(void) { return m_name; }
+	void SetModelName(const char *name) { strncpy(m_name, name, MAX_MODEL_NAME); }
 	void SetColModel(CColModel *col, bool owns = false){
 		m_colModel = col; m_bOwnsColModel = owns; }
 	CColModel *GetColModel(void) { return m_colModel; }
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp
index 9e5b0470..0a542cf6 100644
--- a/src/modelinfo/ModelInfo.cpp
+++ b/src/modelinfo/ModelInfo.cpp
@@ -189,7 +189,7 @@ CModelInfo::GetModelInfo(const char *name, int *id)
 	CBaseModelInfo *modelinfo;
 	for(int i = 0; i < MODELINFOSIZE; i++){
 		modelinfo = CModelInfo::ms_modelInfoPtrs[i];
-	 	if(modelinfo && !CGeneral::faststricmp(modelinfo->GetName(), name)){
+	 	if(modelinfo && !CGeneral::faststricmp(modelinfo->GetModelName(), name)){
 			if(id)
 				*id = i;
 			return modelinfo;
@@ -207,7 +207,7 @@ CModelInfo::GetModelInfo(const char *name, int minIndex, int maxIndex)
 	CBaseModelInfo *modelinfo;
 	for(int i = minIndex; i <= maxIndex; i++){
 		modelinfo = CModelInfo::ms_modelInfoPtrs[i];
-	 	if(modelinfo && !CGeneral::faststricmp(modelinfo->GetName(), name))
+	 	if(modelinfo && !CGeneral::faststricmp(modelinfo->GetModelName(), name))
 			return modelinfo;
 	}
 	return nil;
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index bd515391..e84b9272 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -48,7 +48,7 @@ CPedModelInfo::SetClump(RpClump *clump)
 	if(m_hitColModel == nil)
 		CreateHitColModelSkinned(clump);
 	RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedCB);
-	if(strcmp(GetName(), "player") == 0)
+	if(strcmp(GetModelName(), "player") == 0)
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
 }
 
diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp
index 2e6e557e..757a3721 100644
--- a/src/modelinfo/SimpleModelInfo.cpp
+++ b/src/modelinfo/SimpleModelInfo.cpp
@@ -167,7 +167,7 @@ CSimpleModelInfo::FindRelatedModel(int32 minID, int32 maxID)
 	for(i = minID; i <= maxID; i++){
 		mi = CModelInfo::GetModelInfo(i);
 		if(mi && mi != this &&
-		   !CGeneral::faststrcmp(GetName()+3, mi->GetName()+3)){
+		   !CGeneral::faststrcmp(GetModelName()+3, mi->GetModelName()+3)){
 			assert(mi->IsSimple());
 			this->SetRelatedModel((CSimpleModelInfo*)mi);
 			return;
@@ -189,7 +189,7 @@ CSimpleModelInfo::SetupBigBuilding(int32 minID, int32 maxID)
 			m_lodDistances[2] = related->GetLargestLodDistance()/TheCamera.LODDistMultiplier;
 			if(m_drawLast){
 				m_drawLast = false;
-				debug("%s was draw last\n", GetName());
+				debug("%s was draw last\n", GetModelName());
 			}
 		}else
 			m_lodDistances[2] = NEAR_DRAW_DIST;
diff --git a/src/modelinfo/TimeModelInfo.cpp b/src/modelinfo/TimeModelInfo.cpp
index c1c18dac..0db5fb78 100644
--- a/src/modelinfo/TimeModelInfo.cpp
+++ b/src/modelinfo/TimeModelInfo.cpp
@@ -11,7 +11,7 @@ CTimeModelInfo::FindOtherTimeModel(void)
 	char *p;
 	int i;
 
-	strcpy(name, GetName());
+	strcpy(name, GetModelName());
 	// change _nt to _dy
 	if(p = strstr(name, "_nt"))
 		strncpy(p, "_dy", 4);
@@ -24,7 +24,7 @@ CTimeModelInfo::FindOtherTimeModel(void)
 	for(i = 0; i < MODELINFOSIZE; i++){
 		CBaseModelInfo *mi = CModelInfo::GetModelInfo(i);
 		if (mi && mi->GetModelType() == MITYPE_TIME &&
-		   !CGeneral::faststrncmp(name, mi->GetName(), MAX_MODEL_NAME)){
+		   !CGeneral::faststrncmp(name, mi->GetModelName(), MAX_MODEL_NAME)){
 			m_otherTimeModelID = i;
 			return (CTimeModelInfo*)mi;
 		}
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index b3cc5deb..d7a9d75d 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -491,7 +491,7 @@ void CHud::Draw()
 					CBaseModelInfo *weaponModel = CModelInfo::GetModelInfo(weaponInfo->m_nModelId);
 					RwTexDictionary *weaponTxd = CTxdStore::GetSlot(weaponModel->GetTxdSlot())->texDict;
 					if (weaponTxd) {
-						RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetName());
+						RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetModelName());
 						if (weaponIcon) {
 							RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
 #ifndef FIX_BUGS
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index a946bacb..16d29b26 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -5616,7 +5616,7 @@ CAutomobile::SetBumperDamage(int32 component, ePanels panel, bool noFlyingCompon
 	int status = Damage.GetPanelStatus(panel);
 	if(m_aCarNodes[component] == nil){
 		printf("Trying to damage component %d of %s\n",
-			component, CModelInfo::GetModelInfo(GetModelIndex())->GetName());
+			component, CModelInfo::GetModelInfo(GetModelIndex())->GetModelName());
 		return;
 	}
 	if(status == PANEL_STATUS_SMASHED1){
@@ -5636,7 +5636,7 @@ CAutomobile::SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents
 	int status = Damage.GetDoorStatus(door);
 	if(m_aCarNodes[component] == nil){
 		printf("Trying to damage component %d of %s\n",
-			component, CModelInfo::GetModelInfo(GetModelIndex())->GetName());
+			component, CModelInfo::GetModelInfo(GetModelIndex())->GetModelName());
 		return;
 	}