diff --git a/apps/event/main.c b/apps/event/main.c
index e28cdb6f..57a482e1 100644
--- a/apps/event/main.c
+++ b/apps/event/main.c
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
     BACNET_EVENT_NOTIFICATION_DATA event_data = { 0 };
     BACNET_BIT_STRING *pBitString;
     BACNET_CHARACTER_STRING bcstring;
-    BACNET_PROPERTY_STATE_TYPE tag = BOOLEAN_VALUE;
+    BACNET_PROPERTY_STATES tag = PROP_STATE_BOOLEAN_VALUE;
     BACNET_ADDRESS src = { 0 }; /* address where message came from */
     unsigned timeout = 100; /* milliseconds */
     uint16_t pdu_len = 0;
@@ -406,55 +406,55 @@ int main(int argc, char *argv[])
                             .tag = tag;
                         target_args++;
                     } else if (target_args == 15) {
-                        if (tag == BOOLEAN_VALUE) {
+                        if (tag == PROP_STATE_BOOLEAN_VALUE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.booleanValue =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == BINARY_VALUE) {
+                        } else if (tag == PROP_STATE_BINARY_VALUE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.binaryValue =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == EVENT_TYPE) {
+                        } else if (tag == PROP_STATE_EVENT_TYPE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.eventType = strtol(argv[argi], NULL, 0);
-                        } else if (tag == POLARITY) {
+                        } else if (tag == PROP_STATE_POLARITY) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.polarity = strtol(argv[argi], NULL, 0);
-                        } else if (tag == PROGRAM_CHANGE) {
+                        } else if (tag == PROP_STATE_PROGRAM_CHANGE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.programChange =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == PROGRAM_STATE) {
+                        } else if (tag == PROP_STATE_PROGRAM_STATE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.programState =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == REASON_FOR_HALT) {
+                        } else if (tag == PROP_STATE_REASON_FOR_HALT) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.programError =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == RELIABILITY) {
+                        } else if (tag == PROP_STATE_RELIABILITY) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.reliability =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == STATE) {
+                        } else if (tag == PROP_STATE_EVENT_STATE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.state = strtol(argv[argi], NULL, 0);
-                        } else if (tag == SYSTEM_STATUS) {
+                        } else if (tag == PROP_STATE_SYSTEM_STATUS) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.systemStatus =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == UNITS) {
+                        } else if (tag == PROP_STATE_UNITS) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.units = strtol(argv[argi], NULL, 0);
-                        } else if (tag == UNSIGNED_VALUE) {
+                        } else if (tag == PROP_STATE_UNSIGNED_VALUE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.unsignedValue =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == LIFE_SAFETY_MODE) {
+                        } else if (tag == PROP_STATE_LIFE_SAFETY_MODE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.lifeSafetyMode =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == LIFE_SAFETY_STATE) {
+                        } else if (tag == PROP_STATE_LIFE_SAFETY_STATE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.lifeSafetyState =
                                 strtol(argv[argi], NULL, 0);
diff --git a/apps/uevent/main.c b/apps/uevent/main.c
index 63c79bf4..8587f5de 100644
--- a/apps/uevent/main.c
+++ b/apps/uevent/main.c
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     BACNET_EVENT_NOTIFICATION_DATA event_data = { 0 };
     BACNET_BIT_STRING *pBitString;
     BACNET_CHARACTER_STRING bcstring;
-    BACNET_PROPERTY_STATE_TYPE tag = BOOLEAN_VALUE;
+    BACNET_PROPERTY_STATES tag = PROP_STATE_BOOLEAN_VALUE;
     long dnet = -1;
     BACNET_MAC_ADDRESS mac = { 0 };
     BACNET_MAC_ADDRESS adr = { 0 };
@@ -229,55 +229,55 @@ int main(int argc, char *argv[])
                             .tag = tag;
                         target_args++;
                     } else if (target_args == 10) {
-                        if (tag == BOOLEAN_VALUE) {
+                        if (tag == PROP_STATE_BOOLEAN_VALUE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.booleanValue =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == BINARY_VALUE) {
+                        } else if (tag == PROP_STATE_BINARY_VALUE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.binaryValue =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == EVENT_TYPE) {
+                        } else if (tag == PROP_STATE_EVENT_TYPE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.eventType = strtol(argv[argi], NULL, 0);
-                        } else if (tag == POLARITY) {
+                        } else if (tag == PROP_STATE_POLARITY) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.polarity = strtol(argv[argi], NULL, 0);
-                        } else if (tag == PROGRAM_CHANGE) {
+                        } else if (tag == PROP_STATE_PROGRAM_CHANGE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.programChange =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == PROGRAM_STATE) {
+                        } else if (tag == PROP_STATE_PROGRAM_STATE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.programState =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == REASON_FOR_HALT) {
+                        } else if (tag == PROP_STATE_REASON_FOR_HALT) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.programError =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == RELIABILITY) {
+                        } else if (tag == PROP_STATE_RELIABILITY) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.reliability =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == STATE) {
+                        } else if (tag == PROP_STATE_EVENT_STATE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.state = strtol(argv[argi], NULL, 0);
-                        } else if (tag == SYSTEM_STATUS) {
+                        } else if (tag == PROP_STATE_SYSTEM_STATUS) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.systemStatus =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == UNITS) {
+                        } else if (tag == PROP_STATE_UNITS) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.units = strtol(argv[argi], NULL, 0);
-                        } else if (tag == UNSIGNED_VALUE) {
+                        } else if (tag == PROP_STATE_UNSIGNED_VALUE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.unsignedValue =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == LIFE_SAFETY_MODE) {
+                        } else if (tag == PROP_STATE_LIFE_SAFETY_MODE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.lifeSafetyMode =
                                 strtol(argv[argi], NULL, 0);
-                        } else if (tag == LIFE_SAFETY_STATE) {
+                        } else if (tag == PROP_STATE_LIFE_SAFETY_STATE) {
                             event_data.notificationParams.changeOfState.newState
                                 .state.lifeSafetyState =
                                 strtol(argv[argi], NULL, 0);