diff --git a/Engine/source/T3D/debris.cpp b/Engine/source/T3D/debris.cpp
index 23f18890b..24014d5c8 100644
--- a/Engine/source/T3D/debris.cpp
+++ b/Engine/source/T3D/debris.cpp
@@ -396,7 +396,7 @@ void DebrisData::packData(BitStream* stream)
 
    if( stream->writeFlag( explosion ) )
    {
-      stream->writeRangedU32(packed? SimObjectId((uintptr_t)explosion):
+      stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)explosion):
          explosion->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
    }
 
diff --git a/Engine/source/T3D/fx/particleEmitter.cpp b/Engine/source/T3D/fx/particleEmitter.cpp
index cab153574..079ea84b8 100644
--- a/Engine/source/T3D/fx/particleEmitter.cpp
+++ b/Engine/source/T3D/fx/particleEmitter.cpp
@@ -412,7 +412,7 @@ void ParticleEmitterData::packData(BitStream* stream)
 #if defined(AFX_CAP_PARTICLE_POOLS) 
    if (stream->writeFlag(pool_datablock))
    {
-     stream->writeRangedU32(packed ? SimObjectId((uintptr_t)pool_datablock) : pool_datablock->getId(), DataBlockObjectIdFirst, DataBlockObjectIdLast);
+     stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)pool_datablock) : pool_datablock->getId(), DataBlockObjectIdFirst, DataBlockObjectIdLast);
      stream->write(pool_index);
      stream->writeFlag(pool_depth_fade);
      stream->writeFlag(pool_radial_fade);
diff --git a/Engine/source/T3D/gameBase/gameBase.cpp b/Engine/source/T3D/gameBase/gameBase.cpp
index ad7e4d983..17c050309 100644
--- a/Engine/source/T3D/gameBase/gameBase.cpp
+++ b/Engine/source/T3D/gameBase/gameBase.cpp
@@ -127,13 +127,13 @@ IMPLEMENT_CALLBACK( GameBase, setControl, void, ( bool controlled ), ( controlle
 
 GameBaseData::GameBaseData()
 {
-   category = "";
-   packed = false;
+   mCategory = "";
+   mPacked = false;
 }
 GameBaseData::GameBaseData(const GameBaseData& other, bool temp_clone) : SimDataBlock(other, temp_clone)
 {
-   packed = other.packed;
-   category = other.category;
+   mPacked = other.mPacked;
+   mCategory = other.mCategory;
    //mReloadSignal = other.mReloadSignal; // DO NOT copy the mReloadSignal member. 
 }
 
@@ -158,7 +158,7 @@ void GameBaseData::initPersistFields()
 {
    addGroup("Scripting");
 
-      addField( "category", TypeCaseString, Offset( category, GameBaseData ),
+      addField( "category", TypeCaseString, Offset(mCategory, GameBaseData ),
          "The group that this datablock will show up in under the \"Scripted\" "
          "tab in the World Editor Library." );
 
@@ -171,14 +171,14 @@ bool GameBaseData::preload(bool server, String &errorStr)
 {
    if (!Parent::preload(server, errorStr))
       return false;
-   packed = false;
+   mPacked = false;
    return true;
 }
 
 void GameBaseData::unpackData(BitStream* stream)
 {
    Parent::unpackData(stream);
-   packed = true;
+   mPacked = true;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Engine/source/T3D/gameBase/gameBase.h b/Engine/source/T3D/gameBase/gameBase.h
index e6cf5c973..2571c1426 100644
--- a/Engine/source/T3D/gameBase/gameBase.h
+++ b/Engine/source/T3D/gameBase/gameBase.h
@@ -91,8 +91,8 @@ private:
 
 public:
 
-   bool packed;
-   StringTableEntry category;
+   bool mPacked;
+   StringTableEntry mCategory;
 
    // Signal triggered when this datablock is modified.
    // GameBase objects referencing this datablock notify with this signal.
diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp
index 71f826aa4..652e5ce35 100644
--- a/Engine/source/T3D/shapeBase.cpp
+++ b/Engine/source/T3D/shapeBase.cpp
@@ -808,7 +808,7 @@ void ShapeBaseData::packData(BitStream* stream)
 
    if( stream->writeFlag( debris != NULL ) )
    {
-      stream->writeRangedU32(packed? SimObjectId((uintptr_t)debris):
+      stream->writeRangedU32(mPacked? SimObjectId((uintptr_t)debris):
                              debris->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
    }
 
diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp
index 4319baa4e..56d413a2b 100644
--- a/Engine/source/T3D/shapeImage.cpp
+++ b/Engine/source/T3D/shapeImage.cpp
@@ -1019,7 +1019,7 @@ void ShapeBaseImageData::packData(BitStream* stream)
 
    // Write the projectile datablock
    if (stream->writeFlag(projectile))
-      stream->writeRangedU32(packed? SimObjectId((uintptr_t)projectile):
+      stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)projectile):
                              projectile->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
 
    stream->writeFlag(cloakable);
@@ -1050,7 +1050,7 @@ void ShapeBaseImageData::packData(BitStream* stream)
 
    if( stream->writeFlag( casing ) )
    {
-      stream->writeRangedU32(packed? SimObjectId((uintptr_t)casing):
+      stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)casing):
          casing->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
    }
 
@@ -1139,7 +1139,7 @@ void ShapeBaseImageData::packData(BitStream* stream)
 
          if (stream->writeFlag(s.emitter))
          {
-            stream->writeRangedU32(packed? SimObjectId((uintptr_t)s.emitter):
+            stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)s.emitter):
                                    s.emitter->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
             stream->write(s.emitterTime);
 
diff --git a/Engine/source/T3D/vehicles/flyingVehicle.cpp b/Engine/source/T3D/vehicles/flyingVehicle.cpp
index 3040d94b1..2ee5bc375 100644
--- a/Engine/source/T3D/vehicles/flyingVehicle.cpp
+++ b/Engine/source/T3D/vehicles/flyingVehicle.cpp
@@ -244,7 +244,7 @@ void FlyingVehicleData::packData(BitStream* stream)
    {
       if (stream->writeFlag(sound[i]))
       {
-         SimObjectId writtenId = packed ? SimObjectId((uintptr_t)sound[i]) : sound[i]->getId();
+         SimObjectId writtenId = mPacked ? SimObjectId((uintptr_t)sound[i]) : sound[i]->getId();
          stream->writeRangedU32(writtenId, DataBlockObjectIdFirst, DataBlockObjectIdLast);
       }
    }
@@ -253,7 +253,7 @@ void FlyingVehicleData::packData(BitStream* stream)
    {
       if (stream->writeFlag(jetEmitter[j]))
       {
-         SimObjectId writtenId = packed ? SimObjectId((uintptr_t)jetEmitter[j]) : jetEmitter[j]->getId();
+         SimObjectId writtenId = mPacked ? SimObjectId((uintptr_t)jetEmitter[j]) : jetEmitter[j]->getId();
          stream->writeRangedU32(writtenId, DataBlockObjectIdFirst,DataBlockObjectIdLast);
       }
    }
diff --git a/Engine/source/T3D/vehicles/hoverVehicle.cpp b/Engine/source/T3D/vehicles/hoverVehicle.cpp
index 1da29360b..1f1d259b5 100644
--- a/Engine/source/T3D/vehicles/hoverVehicle.cpp
+++ b/Engine/source/T3D/vehicles/hoverVehicle.cpp
@@ -362,14 +362,14 @@ void HoverVehicleData::packData(BitStream* stream)
 
    for (S32 i = 0; i < MaxSounds; i++)
       if (stream->writeFlag(sound[i]))
-         stream->writeRangedU32(packed? SimObjectId((uintptr_t)sound[i]):
+         stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)sound[i]):
                                 sound[i]->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
 
    for (S32 j = 0; j < MaxJetEmitters; j++)
    {
       if (stream->writeFlag(jetEmitter[j]))
       {
-         SimObjectId writtenId = packed ? SimObjectId((uintptr_t)jetEmitter[j]) : jetEmitter[j]->getId();
+         SimObjectId writtenId = mPacked ? SimObjectId((uintptr_t)jetEmitter[j]) : jetEmitter[j]->getId();
          stream->writeRangedU32(writtenId, DataBlockObjectIdFirst,DataBlockObjectIdLast);
       }
    }
diff --git a/Engine/source/T3D/vehicles/vehicle.cpp b/Engine/source/T3D/vehicles/vehicle.cpp
index a173d61fd..18a7c4466 100644
--- a/Engine/source/T3D/vehicles/vehicle.cpp
+++ b/Engine/source/T3D/vehicles/vehicle.cpp
@@ -277,7 +277,7 @@ void VehicleData::packData(BitStream* stream)
    stream->write(body.friction);
    for (i = 0; i < Body::MaxSounds; i++)
       if (stream->writeFlag(body.sound[i]))
-         stream->writeRangedU32(packed? SimObjectId((uintptr_t)body.sound[i]):
+         stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)body.sound[i]):
                                 body.sound[i]->getId(),DataBlockObjectIdFirst,
                                 DataBlockObjectIdLast);
 
diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.cpp b/Engine/source/T3D/vehicles/wheeledVehicle.cpp
index 455dee9f5..f4f272fd3 100644
--- a/Engine/source/T3D/vehicles/wheeledVehicle.cpp
+++ b/Engine/source/T3D/vehicles/wheeledVehicle.cpp
@@ -477,7 +477,7 @@ void WheeledVehicleData::packData(BitStream* stream)
    Parent::packData(stream);
 
    if (stream->writeFlag(tireEmitter))
-      stream->writeRangedU32(packed? SimObjectId((uintptr_t)tireEmitter):
+      stream->writeRangedU32(mPacked ? SimObjectId((uintptr_t)tireEmitter):
          tireEmitter->getId(),DataBlockObjectIdFirst,DataBlockObjectIdLast);
 
    for (S32 i = 0; i < MaxSounds; i++)
diff --git a/Engine/source/afx/afxEffectGroup.cpp b/Engine/source/afx/afxEffectGroup.cpp
index a7e97f25e..749dbbddb 100644
--- a/Engine/source/afx/afxEffectGroup.cpp
+++ b/Engine/source/afx/afxEffectGroup.cpp
@@ -184,7 +184,7 @@ void afxEffectGroupData::packData(BitStream* stream)
   stream->write(timing.fade_in_time);
   stream->write(timing.fade_out_time);
 
-  pack_fx(stream, fx_list, packed);
+  pack_fx(stream, fx_list, mPacked);
 }
 
 void afxEffectGroupData::unpackData(BitStream* stream)
diff --git a/Engine/source/afx/afxEffectWrapper.cpp b/Engine/source/afx/afxEffectWrapper.cpp
index 0f33585f6..33f73f787 100644
--- a/Engine/source/afx/afxEffectWrapper.cpp
+++ b/Engine/source/afx/afxEffectWrapper.cpp
@@ -380,7 +380,7 @@ void afxEffectWrapperData::packData(BitStream* stream)
 {
   Parent::packData(stream);
 
-  writeDatablockID(stream, effect_data, packed);
+  writeDatablockID(stream, effect_data, mPacked);
 
   stream->writeString(effect_name);
 
@@ -419,7 +419,7 @@ void afxEffectWrapperData::packData(BitStream* stream)
   stream->write(scale_factor);
 
   // modifiers
-  pack_mods(stream, xfm_modifiers, packed);
+  pack_mods(stream, xfm_modifiers, mPacked);
 
   mathWrite(*stream, forced_bbox);
   stream->write(update_forced_bbox);
diff --git a/Engine/source/afx/afxEffectron.cpp b/Engine/source/afx/afxEffectron.cpp
index 5a1bacbf4..b1b7f7eff 100644
--- a/Engine/source/afx/afxEffectron.cpp
+++ b/Engine/source/afx/afxEffectron.cpp
@@ -157,7 +157,7 @@ void afxEffectronData::packData(BitStream* stream)
   stream->write(duration);
   stream->write(n_loops);
 
-  pack_fx(stream, fx_list, packed);
+  pack_fx(stream, fx_list, mPacked);
 }
 
 void afxEffectronData::unpackData(BitStream* stream)
diff --git a/Engine/source/afx/afxMagicSpell.cpp b/Engine/source/afx/afxMagicSpell.cpp
index 39621f8cd..3302d3f35 100644
--- a/Engine/source/afx/afxMagicSpell.cpp
+++ b/Engine/source/afx/afxMagicSpell.cpp
@@ -326,15 +326,15 @@ void afxMagicSpellData::packData(BitStream* stream)
   stream->writeFlag(do_move_interrupts);
   stream->write(move_interrupt_speed);
 
-  writeDatablockID(stream, missile_db, packed);
+  writeDatablockID(stream, missile_db, mPacked);
   stream->write(launch_on_server_signal);
   stream->write(primary_target_types);
 
-  pack_fx(stream, casting_fx_list, packed);
-  pack_fx(stream, launch_fx_list, packed);
-  pack_fx(stream, delivery_fx_list, packed);
-  pack_fx(stream, impact_fx_list, packed);
-  pack_fx(stream, linger_fx_list, packed);
+  pack_fx(stream, casting_fx_list, mPacked);
+  pack_fx(stream, launch_fx_list, mPacked);
+  pack_fx(stream, delivery_fx_list, mPacked);
+  pack_fx(stream, impact_fx_list, mPacked);
+  pack_fx(stream, linger_fx_list, mPacked);
 }
 
 void afxMagicSpellData::unpackData(BitStream* stream)
diff --git a/Engine/source/afx/afxSelectron.cpp b/Engine/source/afx/afxSelectron.cpp
index 148bcceca..81b60c836 100644
--- a/Engine/source/afx/afxSelectron.cpp
+++ b/Engine/source/afx/afxSelectron.cpp
@@ -230,9 +230,9 @@ void afxSelectronData::packData(BitStream* stream)
   stream->write(obj_type_style);
   stream->write(obj_type_mask);
 
-  pack_fx(stream, main_fx_list, packed);
-  pack_fx(stream, select_fx_list, packed);
-  pack_fx(stream, deselect_fx_list, packed);
+  pack_fx(stream, main_fx_list, mPacked);
+  pack_fx(stream, select_fx_list, mPacked);
+  pack_fx(stream, deselect_fx_list, mPacked);
 }
 
 void afxSelectronData::unpackData(BitStream* stream)
diff --git a/Engine/source/afx/afxSpellBook.cpp b/Engine/source/afx/afxSpellBook.cpp
index 42d28d550..cce22129b 100644
--- a/Engine/source/afx/afxSpellBook.cpp
+++ b/Engine/source/afx/afxSpellBook.cpp
@@ -116,7 +116,7 @@ void afxSpellBookData::packData(BitStream* stream)
   stream->write(pages_per_book);
 
   for (S32 i = 0; i < pages_per_book*spells_per_page; i++)
-    writeDatablockID(stream, rpg_spells[i], packed);
+    writeDatablockID(stream, rpg_spells[i], mPacked);
 }
 
 void afxSpellBookData::unpackData(BitStream* stream)
diff --git a/Engine/source/afx/ce/afxLightBase_T3D.cpp b/Engine/source/afx/ce/afxLightBase_T3D.cpp
index 209bc7426..56b76ccca 100644
--- a/Engine/source/afx/ce/afxLightBase_T3D.cpp
+++ b/Engine/source/afx/ce/afxLightBase_T3D.cpp
@@ -176,8 +176,8 @@ void afxT3DLightBaseData::packData(BitStream* stream)
   stream->write( mAnimState.animationPhase );
   stream->write( mFlareScale );
 
-  writeDatablockID(stream, mAnimationData, packed);
-  writeDatablockID(stream, mFlareData, packed);
+  writeDatablockID(stream, mAnimationData, mPacked);
+  writeDatablockID(stream, mFlareData, mPacked);
 }
 
 void afxT3DLightBaseData::unpackData(BitStream* stream)
diff --git a/Engine/source/afx/ce/afxPhraseEffect.cpp b/Engine/source/afx/ce/afxPhraseEffect.cpp
index 3710e2fe6..5df7dfc26 100644
--- a/Engine/source/afx/ce/afxPhraseEffect.cpp
+++ b/Engine/source/afx/ce/afxPhraseEffect.cpp
@@ -235,7 +235,7 @@ void afxPhraseEffectData::packData(BitStream* stream)
 
   stream->writeString(on_trig_cmd);
 
-  pack_fx(stream, fx_list, packed);
+  pack_fx(stream, fx_list, mPacked);
 }
 
 void afxPhraseEffectData::unpackData(BitStream* stream)