diff --git a/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java b/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java
index 2978c5dcc7ec898130884c5bd51f7a723d8258ed..d21bd403ccc7493e76d5d33f15e03acfc976351f 100644
--- a/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java
+++ b/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java
@@ -77,9 +77,9 @@ public class BitFieldRoundTripTest
     espdu.setEntityOrientation(euler);
     
     LandPlatformAppearance app = new LandPlatformAppearance();
-    app.set(LandPlatformAppearance.BLACKOUT_BRAKE_LIGHTS_ON, 1)
-      .set(LandPlatformAppearance.CAMOUFLAGE_TYPE, AppearanceCamouflageType.FOREST_CAMOUFLAGE.getValue())
-      .set(LandPlatformAppearance.IS_FROZEN,1);
+    app.set(LandPlatformAppearance.BLACKOUTBRAKELIGHTSON, 1)
+      .set(LandPlatformAppearance.CAMOUFLAGETYPE, AppearanceCamouflageType.FOREST_CAMOUFLAGE.getValue())
+      .set(LandPlatformAppearance.ISFROZEN,1);
   
     try {
       disNetworkInterface.send(espdu);
diff --git a/test/edu/nps/moves/dis7/MarshalEnumsTest.java b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
index 5a6f3dff0dacc31bc5caa313c22564dd2d410d1b..f437841cd07cee9f73072133df72cceaebedd3be 100644
--- a/test/edu/nps/moves/dis7/MarshalEnumsTest.java
+++ b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
@@ -450,63 +450,63 @@ public class MarshalEnumsTest
       //System.out.println("Testing BitSets");
       /* DisBitSets which were taken from the alphabetical list above where the spaces are */
       // Testing import of particular Bits class
-      marshalOne(new AirPlatformAppearance(AirPlatformAppearance.AFTERBURNER_ON, 1), "17");
+      marshalOne(new AirPlatformAppearance(AirPlatformAppearance.AFTERBURNERON, 1), "17");
 
-      marshalOne(new AirPlatformAppearance().set(AirPlatformAppearance.CANOPY_TROOP_DOOR, AppearanceCanopy.REAR_CANOPY_RIGHT_TROOP_DOOR_OPEN.getValue()), "9 3bitslen = 5");
+      marshalOne(new AirPlatformAppearance().set(AirPlatformAppearance.CANOPYTROOPDOOR, AppearanceCanopy.REAR_CANOPY_RIGHT_TROOP_DOOR_OPEN.getValue()), "9 3bitslen = 5");
 
-      marshalOne(new ArealObjectAppearanceMinefield().set(ArealObjectAppearanceMinefield.BREACH_STATE, 1), "");
+      marshalOne(new ArealObjectAppearanceMinefield().set(ArealObjectAppearanceMinefield.BREACHSTATE, 1), "");
       marshalOne(new CulturalFeatureAppearance().set(CulturalFeatureAppearance.DAMAGE, 1), "");
-      marshalOne(new CulturalFeatureCapabilities().set(CulturalFeatureCapabilities.IED_PRESENCE_INDICATOR, 1), "");
-      marshalOne(new DEDamageDescriptionComponentVisualDamageStatus().set(DEDamageDescriptionComponentVisualDamageStatus.IS_FIRE_PRESENT, 1), "");
-      marshalOne(new DEFireFlags().set(DEFireFlags.STATE_UPDATE_FLAG, 1), "");
+      marshalOne(new CulturalFeatureCapabilities().set(CulturalFeatureCapabilities.IEDPRESENCEINDICATOR, 1), "");
+      marshalOne(new DEDamageDescriptionComponentVisualDamageStatus().set(DEDamageDescriptionComponentVisualDamageStatus.ISFIREPRESENT, 1), "");
+      marshalOne(new DEFireFlags().set(DEFireFlags.STATEUPDATEFLAG, 1), "");
       marshalOne(new EnvironmentalAppearance().set(EnvironmentalAppearance.DENSITY, 1), "");
 
-      marshalOne(new EnvironmentalAppearance().set(EnvironmentalAppearance.DENSITY, 3).set(EnvironmentalAppearance.IS_FROZEN, 1), "");
+      marshalOne(new EnvironmentalAppearance().set(EnvironmentalAppearance.DENSITY, 3).set(EnvironmentalAppearance.ISFROZEN, 1), "");
 
-      marshalOne(new EnvironmentalCapabilities().set(EnvironmentalCapabilities.IED_PRESENCE_INDICATOR, 1), "");
-      marshalOne(new EnvironmentalProcessEnvironmentStatus().set(EnvironmentalProcessEnvironmentStatus.IS_ACTIVE, 1), "");
+      marshalOne(new EnvironmentalCapabilities().set(EnvironmentalCapabilities.IEDPRESENCEINDICATOR, 1), "");
+      marshalOne(new EnvironmentalProcessEnvironmentStatus().set(EnvironmentalProcessEnvironmentStatus.ISACTIVE, 1), "");
       marshalOne(new ExpendableAppearance().set(ExpendableAppearance.DAMAGE, 1), "");
       marshalOne(new ExpendableCapabilities().set(ExpendableCapabilities.RESERVED, 1), "");
-      marshalOne(new LandPlatformAppearance().set(LandPlatformAppearance.BLACKOUT_BRAKE_LIGHTS_ON, 1), "");
-      marshalOne(new LandPlatformCapabilities().set(LandPlatformCapabilities.AMMUNITION_SUPPLY, 1), "");
-      marshalOne(new LifeFormsAppearance().set(LifeFormsAppearance.CAMOUFLAGE_TYPE, 1), "");
-      marshalOne(new LifeFormsCapabilities().set(LifeFormsCapabilities.AMMUNITION_SUPPLY, 1), "");
-      marshalOne(new LinearObjectAppearanceExhaustSmoke().set(LinearObjectAppearanceExhaustSmoke.CHEMICAL_TYPE, 1), "");
-      marshalOne(new LinearObjectAppearanceMinefieldLaneMarker().set(LinearObjectAppearanceMinefieldLaneMarker.VISIBLE_SIDE, 1), "");
+      marshalOne(new LandPlatformAppearance().set(LandPlatformAppearance.BLACKOUTBRAKELIGHTSON, 1), "");
+      marshalOne(new LandPlatformCapabilities().set(LandPlatformCapabilities.AMMUNITIONSUPPLY, 1), "");
+      marshalOne(new LifeFormsAppearance().set(LifeFormsAppearance.CAMOUFLAGETYPE, 1), "");
+      marshalOne(new LifeFormsCapabilities().set(LifeFormsCapabilities.AMMUNITIONSUPPLY, 1), "");
+      marshalOne(new LinearObjectAppearanceExhaustSmoke().set(LinearObjectAppearanceExhaustSmoke.CHEMICALTYPE, 1), "");
+      marshalOne(new LinearObjectAppearanceMinefieldLaneMarker().set(LinearObjectAppearanceMinefieldLaneMarker.VISIBLESIDE, 1), "");
       marshalOne(new LinearObjectAppearanceSpeedBump().set(LinearObjectAppearanceSpeedBump.COLOR, 1), "");
-      marshalOne(new LinearObjectAppearanceTankDitchAndConcertinaWire().set(LinearObjectAppearanceTankDitchAndConcertinaWire.BREACH_LENGTH, 1), "");
+      marshalOne(new LinearObjectAppearanceTankDitchAndConcertinaWire().set(LinearObjectAppearanceTankDitchAndConcertinaWire.BREACHLENGTH, 1), "");
       marshalOne(new LinearObjectAppearanceWire().set(LinearObjectAppearanceWire.COLOR, 1), "");
-      marshalOne(new MinefieldDataFusing().set(MinefieldDataFusing.HAS_ANTI_HANDLING_DEVICE, 1), "");
+      marshalOne(new MinefieldDataFusing().set(MinefieldDataFusing.HASANTIHANDLINGDEVICE, 1), "");
       marshalOne(new MinefieldDataPaintScheme().set(MinefieldDataPaintScheme.ALGAE, 1), "");
-      marshalOne(new MinefieldStateAppearanceBitMap().set(MinefieldStateAppearanceBitMap.ACTIVE_STATUS, 1), "");
-      marshalOne(new MunitionAppearance().set(MunitionAppearance.COVER_SHROUD_STATUS, 1), "");
-      marshalOne(new MunitionCapabilities().set(MunitionCapabilities.IED_PRESENCE_INDICATOR, 1), "");
+      marshalOne(new MinefieldStateAppearanceBitMap().set(MinefieldStateAppearanceBitMap.ACTIVESTATUS, 1), "");
+      marshalOne(new MunitionAppearance().set(MunitionAppearance.COVERSHROUDSTATUS, 1), "");
+      marshalOne(new MunitionCapabilities().set(MunitionCapabilities.IEDPRESENCEINDICATOR, 1), "");
       marshalOne(new NonHumanLifeFormsAppearance().set(NonHumanLifeFormsAppearance.HEALTH, 1), "");
       marshalOne(new ObjectStateAppearanceGeneral().set(ObjectStateAppearanceGeneral.DAMAGE, 1), "");
-      marshalOne(new ObjectStateModificationArealObject().set(ObjectStateModificationArealObject.IS_LOCATION_MODIFIED, 1), "");
-      marshalOne(new ObjectStateModificationLinearObject().set(ObjectStateModificationLinearObject.IS_LOCATION_MODIFIED, 1), "");
-      marshalOne(new ObjectStateModificationPointObject().set(ObjectStateModificationPointObject.IS_LOCATION_MODIFIED, 1), "");
-      marshalOne(new PointObjectAppearanceAirGroundBurst().set(PointObjectAppearanceAirGroundBurst.CHEMICAL_TYPE, 1), "");
+      marshalOne(new ObjectStateModificationArealObject().set(ObjectStateModificationArealObject.ISLOCATIONMODIFIED, 1), "");
+      marshalOne(new ObjectStateModificationLinearObject().set(ObjectStateModificationLinearObject.ISLOCATIONMODIFIED, 1), "");
+      marshalOne(new ObjectStateModificationPointObject().set(ObjectStateModificationPointObject.ISLOCATIONMODIFIED, 1), "");
+      marshalOne(new PointObjectAppearanceAirGroundBurst().set(PointObjectAppearanceAirGroundBurst.CHEMICALTYPE, 1), "");
       marshalOne(new PointObjectAppearanceBuildingStructure().set(PointObjectAppearanceBuildingStructure.COLOR, 1), "");
-      marshalOne(new PointObjectAppearanceCrater().set(PointObjectAppearanceCrater.BREACH_STATE, 1), "");
+      marshalOne(new PointObjectAppearanceCrater().set(PointObjectAppearanceCrater.BREACHSTATE, 1), "");
       marshalOne(new PointObjectAppearanceDisturbedEarthRoad().set(PointObjectAppearanceDisturbedEarthRoad.CONTRAST, 1), "");
-      marshalOne(new PointObjectAppearanceLogCribAbatisEtAl().set(PointObjectAppearanceLogCribAbatisEtAl.BREACH_STATE, 1), "");
+      marshalOne(new PointObjectAppearanceLogCribAbatisEtAl().set(PointObjectAppearanceLogCribAbatisEtAl.BREACHSTATE, 1), "");
       marshalOne(new PointObjectAppearancePothole().set(PointObjectAppearancePothole.DEPTH, 1), "");
-      marshalOne(new PointObjectAppearanceRibbonBridge().set(PointObjectAppearanceRibbonBridge.NUMBER_OF_SEGMENTS, 1), "");
-      marshalOne(new PointObjectAppearanceTree().set(PointObjectAppearanceTree.LEAF_COVERAGE, 1), "");
-      marshalOne(new RadioAppearance().set(RadioAppearance.IS_FROZEN, 1), "");
+      marshalOne(new PointObjectAppearanceRibbonBridge().set(PointObjectAppearanceRibbonBridge.NUMBEROFSEGMENTS, 1), "");
+      marshalOne(new PointObjectAppearanceTree().set(PointObjectAppearanceTree.LEAFCOVERAGE, 1), "");
+      marshalOne(new RadioAppearance().set(RadioAppearance.ISFROZEN, 1), "");
       marshalOne(new RadioCapabilities().set(RadioCapabilities.RESERVED, 1), "");
-      marshalOne(new SensorEmitterAppearance().set(SensorEmitterAppearance.ANTENNA_RAISED, 1), "");
-      marshalOne(new SensorEmitterCapabilities().set(SensorEmitterCapabilities.IED_PRESENCE_INDICATOR, 1), "");
+      marshalOne(new SensorEmitterAppearance().set(SensorEmitterAppearance.ANTENNARAISED, 1), "");
+      marshalOne(new SensorEmitterCapabilities().set(SensorEmitterCapabilities.IEDPRESENCEINDICATOR, 1), "");
       marshalOne(new SpacePlatformAppearance().set(SpacePlatformAppearance.DAMAGE, 1), "");
-      marshalOne(new SpacePlatformCapabilities().set(SpacePlatformCapabilities.AMMUNITION_SUPPLY, 1), "");
-      marshalOne(new StopFreezeFrozenBehavior().set(StopFreezeFrozenBehavior.PROCESS_UPDATES, 1), "");
+      marshalOne(new SpacePlatformCapabilities().set(SpacePlatformCapabilities.AMMUNITIONSUPPLY, 1), "");
+      marshalOne(new StopFreezeFrozenBehavior().set(StopFreezeFrozenBehavior.PROCESSUPDATES, 1), "");
       marshalOne(new SubsurfacePlatformAppearance().set(SubsurfacePlatformAppearance.DAMAGE, 1), "");
-      marshalOne(new SubsurfacePlatformCapabilities().set(SubsurfacePlatformCapabilities.AMMUNITION_SUPPLY, 1), "");
+      marshalOne(new SubsurfacePlatformCapabilities().set(SubsurfacePlatformCapabilities.AMMUNITIONSUPPLY, 1), "");
       marshalOne(new SupplyAppearance().set(SupplyAppearance.DAMAGE, 1), "");
-      marshalOne(new SupplyCapabilities().set(SupplyCapabilities.AMMUNITION_SUPPLY, 1), "");
+      marshalOne(new SupplyCapabilities().set(SupplyCapabilities.AMMUNITIONSUPPLY, 1), "");
       marshalOne(new SurfacePlatformAppearance().set(SurfacePlatformAppearance.DAMAGE, 1), "");
-      marshalOne(new SurfacePlatformCapabilities().set(SurfacePlatformCapabilities.AMMUNITION_SUPPLY, 1), "");
+      marshalOne(new SurfacePlatformCapabilities().set(SurfacePlatformCapabilities.AMMUNITIONSUPPLY, 1), "");
       marshalOne(new UAPropulsionPlantConfiguration().set(UAPropulsionPlantConfiguration.CONFIGURATION, 1), "");
 
       // classes with no enumerated bit positions