diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 221aae93..7050ec96 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -895,7 +895,7 @@ bool Device_Object_Name_Copy(
     bool found = false;
 
     pObject = Device_Objects_Find_Functions(object_type);
-    if ((pObject != NULL) && (pObject->Object_Valid_Instance != NULL)) {
+    if ((pObject != NULL) && (pObject->Object_Name != NULL)) {
         found = pObject->Object_Name(object_instance, object_name);
     }
 
diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c
index 50a668c8..77d42b16 100644
--- a/bacnet-stack/ports/at91sam7s/device.c
+++ b/bacnet-stack/ports/at91sam7s/device.c
@@ -600,7 +600,7 @@ bool Device_Object_Name_Copy(
     bool found = false;
 
     pObject = Device_Objects_Find_Functions(object_type);
-    if ((pObject != NULL) && (pObject->Object_Valid_Instance != NULL)) {
+    if ((pObject != NULL) && (pObject->Object_Name != NULL)) {
         found = pObject->Object_Name(object_instance, object_name);
     }
 
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
index 8e931ae9..51083af6 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
@@ -630,7 +630,7 @@ bool Device_Object_Name_Copy(
     struct my_object_functions *pObject = NULL;
     bool found = false;
     pObject = Device_Objects_Find_Functions(object_type);
-    if ((pObject != NULL) && (pObject->Object_Valid_Instance != NULL)) {
+    if ((pObject != NULL) && (pObject->Object_Name != NULL)) {
         found = pObject->Object_Name(object_instance, object_name);
     }
 
diff --git a/bacnet-stack/ports/stm32f10x/device.c b/bacnet-stack/ports/stm32f10x/device.c
index d9154271..9d3abb0f 100644
--- a/bacnet-stack/ports/stm32f10x/device.c
+++ b/bacnet-stack/ports/stm32f10x/device.c
@@ -582,7 +582,7 @@ bool Device_Object_Name_Copy(
     struct my_object_functions *pObject = NULL;
     bool found = false;
     pObject = Device_Objects_Find_Functions(object_type);
-    if ((pObject != NULL) && (pObject->Object_Valid_Instance != NULL)) {
+    if ((pObject != NULL) && (pObject->Object_Name != NULL)) {
         found = pObject->Object_Name(object_instance, object_name);
     }