diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 984c4e0..cb9d3c6 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -325,6 +325,8 @@ set(BACNETSTACK_SRCS
     ${BACNETSTACK_SRC}/bacnet/basic/sys/ringbuf.h
     ${BACNETSTACK_SRC}/bacnet/basic/sys/sbuf.c
     ${BACNETSTACK_SRC}/bacnet/basic/sys/sbuf.h
+    ${BACNETSTACK_SRC}/bacnet/basic/sys/state_name.c
+    ${BACNETSTACK_SRC}/bacnet/basic/sys/state_name.h
     ${BACNETSTACK_SRC}/bacnet/basic/tsm/tsm.c
     ${BACNETSTACK_SRC}/bacnet/basic/tsm/tsm.h
     ${BACNETSTACK_SRC}/bacnet/basic/sys/bits.h
diff --git a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
index cea46d2..ff7acc3 100644
--- a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
@@ -64,6 +64,7 @@ if(BOARD STREQUAL unit_testing)
     ${BACNET_BASE}/src/bacnet/basic/sys/days.c
     ${BACNET_BASE}/src/bacnet/basic/sys/debug.c
     ${BACNET_BASE}/src/bacnet/basic/sys/keylist.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_BASE}/src/bacnet/channel_value.c
     ${BACNET_TEST_PATH}/src/main.c
     ${BACNET_BASE}/test/bacnet/basic/object/test/property_test.c
diff --git a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
index 65d9d7e..6200449 100644
--- a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
@@ -66,6 +66,7 @@ if(BOARD STREQUAL unit_testing)
     ${BACNET_BASE}/src/bacnet/basic/sys/days.c
     ${BACNET_BASE}/src/bacnet/basic/sys/debug.c
     ${BACNET_BASE}/src/bacnet/basic/sys/keylist.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     ${BACNET_BASE}/test/bacnet/basic/object/test/property_test.c
     )
diff --git a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
index f05a6b8..7cba7ca 100644
--- a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
@@ -65,6 +65,7 @@ if(BOARD STREQUAL unit_testing)
     ${BACNET_BASE}/src/bacnet/basic/sys/days.c
     ${BACNET_BASE}/src/bacnet/basic/sys/debug.c
     ${BACNET_BASE}/src/bacnet/basic/sys/keylist.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     ${BACNET_BASE}/test/bacnet/basic/object/test/property_test.c
     )
diff --git a/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt
index 6a48629..18e992d 100644
--- a/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt
@@ -23,6 +23,7 @@ if(BOARD STREQUAL unit_testing)
   list(APPEND INCLUDE ${BACNET_INCLUDE})
   list(APPEND SOURCES
     ${BACNET_BASE}/src/bacnet/basic/sys/fifo.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     )
 
diff --git a/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt
index 7f8d08b..f5433c6 100644
--- a/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt
@@ -27,6 +27,7 @@ if(BOARD STREQUAL unit_testing)
   list(APPEND SOURCES
     ${BACNET_BASE}/src/bacnet/basic/sys/filename.c
     ${BACNET_BASE}/src/bacnet/basic/sys/debug.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     )
 
diff --git a/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt
index d88d95c..18afffb 100644
--- a/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt
@@ -25,6 +25,7 @@ if(BOARD STREQUAL unit_testing)
   list(APPEND SOURCES
     ${BACNET_SRC_PATH}.c
     ${BACNET_TEST_PATH}/src/main.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     )
 
   find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt
index 7bc3e93..b21a03f 100644
--- a/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt
@@ -23,6 +23,7 @@ if(BOARD STREQUAL unit_testing)
   list(APPEND INCLUDE ${BACNET_INCLUDE})
   list(APPEND SOURCES
     ${BACNET_BASE}/src/bacnet/basic/sys/keylist.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     )
 
diff --git a/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt
index 4b1a877..75040c1 100644
--- a/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt
@@ -23,6 +23,7 @@ if(BOARD STREQUAL unit_testing)
   list(APPEND INCLUDE ${BACNET_INCLUDE})
   list(APPEND SOURCES
     ${BACNET_BASE}/src/bacnet/basic/sys/ringbuf.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     )
 
diff --git a/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt
index 66dbcb5..0cbf721 100644
--- a/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt
+++ b/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt
@@ -23,6 +23,7 @@ if(BOARD STREQUAL unit_testing)
   list(APPEND INCLUDE ${BACNET_INCLUDE})
   list(APPEND SOURCES
     ${BACNET_BASE}/src/bacnet/basic/sys/sbuf.c
+    ${BACNET_BASE}/src/bacnet/basic/sys/state_name.c
     ${BACNET_TEST_PATH}/src/main.c
     )