8 files changed, 22 insertions, 22 deletions

diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 71a07d0019..10bf10543a 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -181,7 +181,7 @@ bool GameObject::load(MfcArchive &file) {
 	
 	_id = file.readUint16LE();
 	
-	_stringObj = file.readPascalString();
+	_objectName = file.readPascalString();
 	_ox = file.readUint32LE();
 	_oy = file.readUint32LE();
 	_priority = file.readUint16LE();
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index e4989cd9e8..a4f9d8fe2c 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -97,7 +97,7 @@ class GameObject : public CObject {
 	int _field_8;
 	int16 _flags;
 	int16 _id;
-	char *_stringObj;
+	char *_objectName;
 	int _ox;
 	int _oy;
 	int _priority;
diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index 0258ed4552..1d84305a96 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -47,7 +47,7 @@ class GameProject : public CObject {
 class MessageQueue : public CObject {
 	int _id;
 	int _flags;
-	char *_stringObj;
+	char *_queueName;
 	int16 _dataId;
 	int16 _field_12;
 	int _field_14;
@@ -78,7 +78,7 @@ class CInteraction : public CObject {
 	int _sceneId;
 	int _field_28;
 	int _flags;
-	char *_stringObj;
+	char *_actionName;
 
  public:
 	CInteraction();
@@ -222,7 +222,7 @@ class CGameVar : public CObject {
 	CGameVar *_parentVarObj;
 	CGameVar *_subVars;
 	CGameVar *_field_14;
-	char *_stringObj;
+	char *_varName;
 	VarValue _value;
 	int _varType;
 
@@ -292,7 +292,7 @@ class CGameLoader : public CObject {
 
 class CObjstateCommand : public CObject {
 	ExCommand _cmd;
-	char *_stringObj;
+	char *_objCommandName;
 	int _value;
 
  public:
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 81fa91cca0..2ce93eefe4 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -123,8 +123,8 @@ bool Scene::load(MfcArchive &file) {
 
 	_sceneId = file.readUint16LE();
 	
-	_scstringObj = file.readPascalString();
-	debug(0, "scene: <%s> %d", transCyrillic((byte *)_scstringObj), _sceneId);
+	_sceneName = file.readPascalString();
+	debug(0, "scene: <%s> %d", transCyrillic((byte *)_sceneName), _sceneId);
 
 	int count = file.readUint16LE();
 	debug(7, "scene.ani: %d", count);
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index cdb5cf2bb2..639bff0c93 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -33,7 +33,7 @@ class Scene : public Background {
 	Shadows *_shadows;
 	SoundList *_soundList;
 	int16 _sceneId;
-	char *_scstringObj;
+	char *_sceneName;
 	int _field_BC;
 	NGIArchive *_libHandle;
 
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index d1f9e00a6a..f3cf644b9a 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -307,7 +307,7 @@ bool CInteraction::load(MfcArchive &file) {
 	_yOffs = file.readUint32LE();
 	_sceneId = file.readUint32LE();
 	_flags = file.readUint32LE();
-	_stringObj = file.readPascalString();
+	_actionName = file.readPascalString();
 
 	_messageQueue = (MessageQueue *)file.readClass();
 
@@ -332,7 +332,7 @@ bool MessageQueue::load(MfcArchive &file) {
 
 	assert(g_fullpipe->_gameProjectVersion >= 12);
 
-	_stringObj = file.readPascalString();
+	_queueName = file.readPascalString();
 
 	for (int i = 0; i < count; i++) {
 		CObject *tmp = file.readClass();
@@ -411,7 +411,7 @@ bool CObjstateCommand::load(MfcArchive &file) {
 
 	_value = file.readUint32LE();
 
-	_stringObj = file.readPascalString();
+	_objCommandName = file.readPascalString();
 
 	return true;
 }
@@ -447,14 +447,14 @@ CGameVar::CGameVar() {
 }
 
 bool CGameVar::load(MfcArchive &file) {
-	_stringObj = file.readPascalString();
+	_varName = file.readPascalString();
 	_varType = file.readUint32LE();
 
 	debugN(6, "[%03d] ", file.getLevel());
 	for (int i = 0; i < file.getLevel(); i++)
 		debugN(6, " ");
 
-	debugN(6, "<%s>: ", transCyrillic((byte *)_stringObj));
+	debugN(6, "<%s>: ", transCyrillic((byte *)_varName));
 
 	switch (_varType) {
 	case 0:
@@ -489,7 +489,7 @@ CGameVar *CGameVar::getSubVarByName(const char *name) {
 
 	if (_subVars != 0) {
 		sv = _subVars;
-		for (;sv && scumm_stricmp(sv->_stringObj, name); sv = sv->_nextVarObj)
+		for (;sv && scumm_stricmp(sv->_varName, name); sv = sv->_nextVarObj)
 			;
 	}
 	return sv;
@@ -510,8 +510,8 @@ bool CGameVar::setSubVarAsInt(const char *name, int value) {
 	var = new CGameVar();
 	var->_varType = 0;
 	var->_value.intValue = value;
-	var->_stringObj = (char *)calloc(strlen(name) + 1, 1);
-	strcpy(var->_stringObj, name);
+	var->_varName = (char *)calloc(strlen(name) + 1, 1);
+	strcpy(var->_varName, name);
 
 	return addSubVar(var);
 }
@@ -534,8 +534,8 @@ CGameVar *CGameVar::addSubVarAsInt(const char *name, int value) {
 		var->_varType = 0;
 		var->_value.intValue = value;
 
-		var->_stringObj = (char *)calloc(strlen(name) + 1, 1);
-		strcpy(var->_stringObj, name);
+		var->_varName = (char *)calloc(strlen(name) + 1, 1);
+		strcpy(var->_varName, name);
 
 		return (addSubVar(var) != 0) ? var : 0;
 	}
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 4a2616ca91..cc51691a44 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -144,8 +144,8 @@ bool Statics::load(MfcArchive &file) {
 
 	_staticsId = file.readUint16LE();
 
-	_stringObj = file.readPascalString();
-	debug(7, "statics: <%s>", transCyrillic((byte *)_stringObj));
+	_staticsName = file.readPascalString();
+	debug(7, "statics: <%s>", transCyrillic((byte *)_staticsName));
 
 	_picture = new Picture();
 	_picture->load(file);
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 3f16878747..5b27b547c5 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -66,7 +66,7 @@ class Statics : public DynamicPhase {
 
  	int16 _staticsId;
 	int16 _field_86;
-	char *_stringObj;
+	char *_staticsName;
 	Picture *_picture;
 
   public: