diff --git a/Engine/source/afx/afxChoreographer.cpp b/Engine/source/afx/afxChoreographer.cpp
index 5473552f5..e0f20fa75 100644
--- a/Engine/source/afx/afxChoreographer.cpp
+++ b/Engine/source/afx/afxChoreographer.cpp
@@ -142,7 +142,7 @@ afxChoreographer::afxChoreographer()
   lod = 0;
   exec_conds_mask = 0;
   choreographer_id = 0;
-  extra = 0;
+  mExtra = 0;
   started_with_newop = false;
   postpone_activation = false;
   remapped_cons_sent = false; // CONSTRAINT REMAPPING
@@ -179,7 +179,7 @@ afxChoreographer::~afxChoreographer()
 void afxChoreographer::initPersistFields()
 {
   // conditionals
-  addField("extra",              TYPEID<SimObject>(), Offset(extra, afxChoreographer),
+  addField("extra",              TYPEID<SimObject>(), Offset(mExtra, afxChoreographer),
     "...");
   addField("postponeActivation", TypeBool,            Offset(postpone_activation, afxChoreographer),
     "...");
diff --git a/Engine/source/afx/afxChoreographer.h b/Engine/source/afx/afxChoreographer.h
index 3665e1306..e3b83585e 100644
--- a/Engine/source/afx/afxChoreographer.h
+++ b/Engine/source/afx/afxChoreographer.h
@@ -121,7 +121,7 @@ protected:
   U8                ranking;
   U8                lod;
   U32               exec_conds_mask;
-  SimObject*        extra;
+  SimObject*        mExtra;
   Vector<NetConnection*> explicit_clients;
   bool              started_with_newop;
   bool              postpone_activation;
@@ -182,7 +182,7 @@ public:
   void              clearChoreographerId() { choreographer_id = 0; }
   U32               getChoreographerId() { return choreographer_id; }
   void              setGhostConstraintObject(SceneObject*, StringTableEntry cons_name);
-  void              setExtra(SimObject* extra) { this->extra = extra; }
+  void              setExtra(SimObject* extra) { mExtra = extra; }
   void              addExplicitClient(NetConnection* conn);
   void              removeExplicitClient(NetConnection* conn);
   U32               getExplicitClientCount() { return explicit_clients.size(); }
diff --git a/Engine/source/afx/afxEffectron.cpp b/Engine/source/afx/afxEffectron.cpp
index b33fd9d99..5a1bacbf4 100644
--- a/Engine/source/afx/afxEffectron.cpp
+++ b/Engine/source/afx/afxEffectron.cpp
@@ -407,9 +407,9 @@ U32 afxEffectron::packUpdate(NetConnection* conn, U32 mask, BitStream* stream)
   if (stream->writeFlag(mask & InitialUpdateMask))
   {
     // pack extra object's ghost index or scope id if not yet ghosted
-    if (stream->writeFlag(dynamic_cast<NetObject*>(extra) != 0))
+    if (stream->writeFlag(dynamic_cast<NetObject*>(mExtra) != 0))
     {
-      NetObject* net_extra = (NetObject*)extra;
+      NetObject* net_extra = (NetObject*)mExtra;
       S32 ghost_idx = conn->getGhostIndex(net_extra);
       if (stream->writeFlag(ghost_idx != -1))
          stream->writeRangedU32(U32(ghost_idx), 0, NetConnection::MaxGhostCount);
@@ -476,7 +476,7 @@ void afxEffectron::unpackUpdate(NetConnection * conn, BitStream * stream)
       if (stream->readFlag()) // is ghost_idx
       {
         S32 ghost_idx = stream->readRangedU32(0, NetConnection::MaxGhostCount);
-        extra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
+		mExtra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
       }
       else
       {
diff --git a/Engine/source/afx/afxMagicSpell.cpp b/Engine/source/afx/afxMagicSpell.cpp
index 7aeb93da8..39621f8cd 100644
--- a/Engine/source/afx/afxMagicSpell.cpp
+++ b/Engine/source/afx/afxMagicSpell.cpp
@@ -1089,9 +1089,9 @@ U32 afxMagicSpell::packUpdate(NetConnection* conn, U32 mask, BitStream* stream)
   if (stream->writeFlag(mask & InitialUpdateMask))
   {
     // pack extra object's ghost index or scope id if not yet ghosted
-    if (stream->writeFlag(dynamic_cast<NetObject*>(extra) != 0))
+    if (stream->writeFlag(dynamic_cast<NetObject*>(mExtra) != 0))
     {
-      NetObject* net_extra = (NetObject*)extra;
+      NetObject* net_extra = (NetObject*)mExtra;
       S32 ghost_idx = conn->getGhostIndex(net_extra);
       if (stream->writeFlag(ghost_idx != -1))
          stream->writeRangedU32(U32(ghost_idx), 0, NetConnection::MaxGhostCount);
@@ -1252,7 +1252,7 @@ void afxMagicSpell::unpackUpdate(NetConnection * conn, BitStream * stream)
       if (stream->readFlag()) // is ghost_idx
       {
         S32 ghost_idx = stream->readRangedU32(0, NetConnection::MaxGhostCount);
-        extra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
+		mExtra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
       }
       else
       {