diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 334cc7e9..980e837a 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -1522,15 +1522,14 @@ bool Device_Write_Property_Local(
                     &object_type, &object_instance)) {
                     if ((object_type == wp_data->object_type) &&
                         (object_instance == wp_data->object_instance)) {
-                        /* okay to set my name as the same name */
+                        /* writing same name to same object */
                         status = true;
                     } else {
                         status = false;
                         wp_data->error_class = ERROR_CLASS_PROPERTY;
                         wp_data->error_code = ERROR_CODE_DUPLICATE_NAME;
                     }
-                }
-                if (status) {
+                } else {
                     Device_Set_Object_Name(&value.type.Character_String);
                 }
             }
diff --git a/bacnet-stack/demo/object/ms-input.c b/bacnet-stack/demo/object/ms-input.c
index 0dbf498e..d2c97393 100644
--- a/bacnet-stack/demo/object/ms-input.c
+++ b/bacnet-stack/demo/object/ms-input.c
@@ -653,6 +653,7 @@ bool Multistate_Input_Write_Property(
                     &object_type, &object_instance)) {
                     if ((object_type == wp_data->object_type) &&
                         (object_instance == wp_data->object_instance)) {
+                        /* writing same name to same object */
                         status = true;
                     } else {
                         status = false;
@@ -660,9 +661,6 @@ bool Multistate_Input_Write_Property(
                         wp_data->error_code = ERROR_CODE_DUPLICATE_NAME;
                     }
                 } else {
-                    status = true;
-                }
-                if (status) {
                     status = Multistate_Input_Object_Name_Write(
                         wp_data->object_instance,
                         &value.type.Character_String,