diff --git a/src/mtconnect/validation/observation_validations.hpp b/src/mtconnect/validation/observation_validations.hpp
index 1f7cb73e..bc2843f2 100644
--- a/src/mtconnect/validation/observation_validations.hpp
+++ b/src/mtconnect/validation/observation_validations.hpp
@@ -5,53 +5,28 @@ Validation ControlledVocabularies {
     {"AssetChanged", {}},
     {"AssetRemoved", {}},
     {"Availability", {{"AVAILABLE", 0}, {"UNAVAILABLE", 0}}},
-    {"AxisCoupling", {{"TANDEM", 0}, {"SYNCHRONOUS", 0}, {"MASTER", 0}, {"SLAVE", 0}}},
+    {"AxisCoupling", {{"MASTER", 0}, {"SLAVE", 0}, {"SYNCHRONOUS", 0}, {"TANDEM", 0}}},
     {"AxisFeedrateOverride", {}},
     {"AxisInterlock", {{"ACTIVE", 0}, {"INACTIVE", 0}}},
-    {"AxisState", {{"HOME", 0}, {"TRAVEL", 0}, {"PARKED", 0}, {"STOPPED", 0}}},
+    {"AxisState", {{"HOME", 0}, {"PARKED", 0}, {"STOPPED", 0}, {"TRAVEL", 0}}},
     {"Block", {}},
     {"BlockCount", {}},
     {"ChuckInterlock", {{"ACTIVE", 0}, {"INACTIVE", 0}}},
-    {"ChuckState", {{"OPEN", 0}, {"CLOSED", 0}, {"UNLATCHED", 0}}},
+    {"ChuckState", {{"CLOSED", 0}, {"OPEN", 0}, {"UNLATCHED", 0}}},
     {"Code", {}},
     {"CompositionState", {}},
-    {"ControllerMode",
-     {{"AUTOMATIC", 0},
-      {"MANUAL", 0},
-      {"MANUAL_DATA_INPUT", 0},
-      {"SEMI_AUTOMATIC", 0},
-      {"EDIT", 0},
-      {"FEED_HOLD", SCHEMA_VERSION(1, 3)}}},
-    {"ControllerModeOverride", {{"ON", 0}, {"OFF", 0}}},
+    {"ControllerMode", {{"AUTOMATIC", 0}, {"MANUAL", 0}, {"MANUAL_DATA_INPUT", 0}, {"SEMI_AUTOMATIC", 0}, {"FEED_HOLD", SCHEMA_VERSION(1, 3)}, {"EDIT", 0}}},
+    {"ControllerModeOverride", {{"OFF", 0}, {"ON", 0}}},
     {"CoupledAxes", {}},
     {"DateCode", {}},
     {"DeviceUuid", {}},
-    {"Direction",
-     {{"CLOCKWISE", SCHEMA_VERSION(1, 4)},
-      {"COUNTER_CLOCKWISE", SCHEMA_VERSION(1, 4)},
-      {"POSITIVE", SCHEMA_VERSION(1, 4)},
-      {"NEGATIVE", SCHEMA_VERSION(1, 4)}}},
-    {"DoorState", {{"OPEN", 0}, {"CLOSED", 0}, {"UNLATCHED", 0}}},
+    {"Direction", {{"CLOCKWISE", SCHEMA_VERSION(1, 4)}, {"COUNTER_CLOCKWISE", SCHEMA_VERSION(1, 4)}, {"NEGATIVE", SCHEMA_VERSION(1, 4)}, {"POSITIVE", SCHEMA_VERSION(1, 4)}}},
+    {"DoorState", {{"CLOSED", 0}, {"OPEN", 0}, {"UNLATCHED", 0}}},
     {"EmergencyStop", {{"ARMED", 0}, {"TRIGGERED", 0}}},
-    {"EndOfBar", {{"YES", 0}, {"NO", 0}}},
-    {"EquipmentMode", {{"ON", 0}, {"OFF", 0}}},
-    {"Execution",
-     {{"READY", 0},
-      {"ACTIVE", 0},
-      {"INTERRUPTED", 0},
-      {"FEED_HOLD", 0},
-      {"STOPPED", 0},
-      {"OPTIONAL_STOP", 0},
-      {"PROGRAM_STOPPED", 0},
-      {"PROGRAM_COMPLETED", 0},
-      {"WAIT", 0},
-      {"PROGRAM_OPTIONAL_STOP", SCHEMA_VERSION(1, 4)}}},
-    {"FunctionalMode",
-     {{"PRODUCTION", 0},
-      {"SETUP", 0},
-      {"TEARDOWN", 0},
-      {"MAINTENANCE", 0},
-      {"PROCESS_DEVELOPMENT", 0}}},
+    {"EndOfBar", {{"NO", 0}, {"YES", 0}}},
+    {"EquipmentMode", {{"OFF", 0}, {"ON", 0}}},
+    {"Execution", {{"ACTIVE", 0}, {"INTERRUPTED", 0}, {"READY", 0}, {"STOPPED", 0}, {"FEED_HOLD", 0}, {"PROGRAM_COMPLETED", 0}, {"PROGRAM_OPTIONAL_STOP", SCHEMA_VERSION(1, 4)}, {"PROGRAM_STOPPED", 0}, {"OPTIONAL_STOP", 0}, {"WAIT", 0}}},
+    {"FunctionalMode", {{"MAINTENANCE", 0}, {"PROCESS_DEVELOPMENT", 0}, {"PRODUCTION", 0}, {"SETUP", 0}, {"TEARDOWN", 0}}},
     {"Hardness", {}},
     {"Line", {}},
     {"LineLabel", {}},
@@ -62,23 +37,23 @@ Validation ControlledVocabularies {
     {"OperatorId", {}},
     {"PalletId", {}},
     {"PartCount", {}},
-    {"PartDetect", {{"PRESENT", 0}, {"NOT_PRESENT", 0}}},
+    {"PartDetect", {{"NOT_PRESENT", 0}, {"PRESENT", 0}}},
     {"PartId", {}},
     {"PartNumber", {}},
     {"PathFeedrateOverride", {}},
-    {"PathMode", {{"INDEPENDENT", 0}, {"MASTER", 0}, {"SYNCHRONOUS", 0}, {"MIRROR", 0}}},
-    {"PowerState", {{"ON", 0}, {"OFF", 0}}},
-    {"PowerStatus", {{"ON", SCHEMA_VERSION(1, 1)}, {"OFF", SCHEMA_VERSION(1, 1)}}},
+    {"PathMode", {{"INDEPENDENT", 0}, {"MIRROR", 0}, {"SYNCHRONOUS", 0}, {"MASTER", 0}}},
+    {"PowerState", {{"OFF", 0}, {"ON", 0}}},
+    {"PowerStatus", {{"OFF", SCHEMA_VERSION(1, 1)}, {"ON", SCHEMA_VERSION(1, 1)}}},
     {"ProcessTime", {}},
     {"Program", {}},
     {"ProgramComment", {}},
-    {"ProgramEdit", {{"ACTIVE", 0}, {"READY", 0}, {"NOT_READY", 0}}},
+    {"ProgramEdit", {{"ACTIVE", 0}, {"NOT_READY", 0}, {"READY", 0}}},
     {"ProgramEditName", {}},
     {"ProgramHeader", {}},
     {"ProgramLocation", {}},
-    {"ProgramLocationType", {{"LOCAL", 0}, {"EXTERNAL", 0}}},
+    {"ProgramLocationType", {{"EXTERNAL", 0}, {"LOCAL", 0}}},
     {"ProgramNestLevel", {}},
-    {"RotaryMode", {{"SPINDLE", 0}, {"INDEX", 0}, {"CONTOUR", 0}}},
+    {"RotaryMode", {{"CONTOUR", 0}, {"INDEX", 0}, {"SPINDLE", 0}}},
     {"RotaryVelocityOverride", {}},
     {"SerialNumber", {}},
     {"SpindleInterlock", {{"ACTIVE", 0}, {"INACTIVE", 0}}},
@@ -89,18 +64,7 @@ Validation ControlledVocabularies {
     {"ToolOffset", {}},
     {"User", {}},
     {"Variable", {}},
-    {"WaitState",
-     {{"POWERING_UP", 0},
-      {"POWERING_DOWN", 0},
-      {"PART_LOAD", 0},
-      {"PART_UNLOAD", 0},
-      {"TOOL_LOAD", 0},
-      {"TOOL_UNLOAD", 0},
-      {"MATERIAL_LOAD", 0},
-      {"MATERIAL_UNLOAD", 0},
-      {"SECONDARY_PROCESS", 0},
-      {"PAUSING", 0},
-      {"RESUMING", 0}}},
+    {"WaitState", {{"MATERIAL_LOAD", 0}, {"MATERIAL_UNLOAD", 0}, {"PART_LOAD", 0}, {"PART_UNLOAD", 0}, {"PAUSING", 0}, {"POWERING_DOWN", 0}, {"POWERING_UP", 0}, {"RESUMING", 0}, {"SECONDARY_PROCESS", 0}, {"TOOL_LOAD", 0}, {"TOOL_UNLOAD", 0}}},
     {"Wire", {}},
     {"WorkholdingId", {}},
     {"WorkOffset", {}},
@@ -113,7 +77,7 @@ Validation ControlledVocabularies {
     {"Rotation", {}},
     {"Translation", {}},
     {"ProcessKindId", {}},
-    {"PartStatus", {{"PASS", 0}, {"FAIL", 0}}},
+    {"PartStatus", {{"FAIL", 0}, {"PASS", 0}}},
     {"AlarmLimit", {}},
     {"ProcessAggregateId", {}},
     {"PartKindId", {}},
@@ -121,7 +85,7 @@ Validation ControlledVocabularies {
     {"DeviceRemoved", {}},
     {"DeviceChanged", {}},
     {"SpecificationLimit", {}},
-    {"ConnectionStatus", {{"CLOSED", 0}, {"LISTEN", 0}, {"ESTABLISHED", 0}}},
+    {"ConnectionStatus", {{"CLOSED", 0}, {"ESTABLISHED", 0}, {"LISTEN", 0}}},
     {"AdapterSoftwareVersion", {}},
     {"SensorAttachment", {}},
     {"ControlLimit", {}},
@@ -134,27 +98,9 @@ Validation ControlledVocabularies {
     {"DeactivationCount", {}},
     {"TransferCount", {}},
     {"LoadCount", {}},
-    {"PartProcessingState",
-     {{"NEEDS_PROCESSING", 0},
-      {"IN_PROCESS", 0},
-      {"PROCESSING_ENDED", 0},
-      {"PROCESSING_ENDED_COMPLETE", 0},
-      {"PROCESSING_ENDED_STOPPED", 0},
-      {"PROCESSING_ENDED_ABORTED", 0},
-      {"PROCESSING_ENDED_LOST", 0},
-      {"PROCESSING_ENDED_SKIPPED", 0},
-      {"PROCESSING_ENDED_REJECTED", 0},
-      {"WAITING_FOR_TRANSIT", 0},
-      {"IN_TRANSIT", 0},
-      {"TRANSIT_COMPLETE", 0}}},
-    {"ProcessState",
-     {{"INITIALIZING", 0},
-      {"READY", 0},
-      {"ACTIVE", 0},
-      {"COMPLETE", 0},
-      {"INTERRUPTED", 0},
-      {"ABORTED", 0}}},
-    {"ValveState", {{"OPEN", 0}, {"OPENING", 0}, {"CLOSED", 0}, {"CLOSING", 0}}},
+    {"PartProcessingState", {{"IN_PROCESS", 0}, {"IN_TRANSIT", 0}, {"NEEDS_PROCESSING", 0}, {"PROCESSING_ENDED", 0}, {"PROCESSING_ENDED_ABORTED", 0}, {"PROCESSING_ENDED_COMPLETE", 0}, {"PROCESSING_ENDED_LOST", 0}, {"PROCESSING_ENDED_REJECTED", 0}, {"PROCESSING_ENDED_SKIPPED", 0}, {"PROCESSING_ENDED_STOPPED", 0}, {"TRANSIT_COMPLETE", 0}, {"WAITING_FOR_TRANSIT", 0}}},
+    {"ProcessState", {{"ABORTED", 0}, {"ACTIVE", 0}, {"COMPLETE", 0}, {"INITIALIZING", 0}, {"INTERRUPTED", 0}, {"READY", 0}}},
+    {"ValveState", {{"CLOSED", 0}, {"CLOSING", 0}, {"OPEN", 0}, {"OPENING", 0}}},
     {"LockState", {{"LOCKED", 0}, {"UNLOCKED", 0}}},
     {"UnloadCount", {}},
     {"CycleCount", {}},
@@ -162,12 +108,12 @@ Validation ControlledVocabularies {
     {"AssetCount", {}},
     {"MaintenanceList", {}},
     {"FixtureId", {}},
-    {"PartCountType", {{"EACH", 0}, {"BATCH", 0}}},
+    {"PartCountType", {{"BATCH", 0}, {"EACH", 0}}},
     {"ClockTime", {}},
     {"NetworkPort", {}},
     {"HostName", {}},
     {"LeakDetect", {{"DETECTED", 0}, {"NOT_DETECTED", 0}}},
-    {"BatteryState", {{"CHARGED", 0}, {"CHARGING", 0}, {"DISCHARGING", 0}, {"DISCHARGED", 0}}},
+    {"BatteryState", {{"CHARGED", 0}, {"CHARGING", 0}, {"DISCHARGED", 0}, {"DISCHARGING", 0}}},
     {"FeaturePersisitentId", {}},
     {"SensorState", {}},
     {"ComponentData", {}},
@@ -178,15 +124,7 @@ Validation ControlledVocabularies {
     {"MeasurementType", {}},
     {"MeasurementValue", {}},
     {"MeasurementUnits", {}},
-    {"CharacteristicStatus",
-     {{"PASS", 0},
-      {"FAIL", 0},
-      {"REWORK", 0},
-      {"SYSTEM_ERROR", 0},
-      {"INDETERMINATE", 0},
-      {"NOT_ANALYZED", 0},
-      {"BASIC_OR_THEORETIC_EXACT_DIMENSION", 0},
-      {"UNDEFINED", 0}}},
+    {"CharacteristicStatus", {{"BASIC_OR_THEORETIC_EXACT_DIMENSION", 0}, {"FAIL", 0}, {"INDETERMINATE", 0}, {"NOT_ANALYZED", 0}, {"PASS", 0}, {"REWORK", 0}, {"SYSTEM_ERROR", 0}, {"UNDEFINED", 0}}},
     {"UncertaintyType", {{"COMBINED", 0}, {"MEAN", 0}}},
     {"Uncertainty", {}},
     {"AlarmLimits", {}},
@@ -197,4 +135,5 @@ Validation ControlledVocabularies {
     {"ActivePowerSource", {}},
     {"LocationNarrative", {}},
     {"Thickness", {}},
-    {"LocationSpatialGeographic", {}}};
+    {"LocationSpatialGeographic", {}}
+};
\ No newline at end of file