diff --git a/bacnet-stack/demo/handler/s_cov.c b/bacnet-stack/demo/handler/s_cov.c
index 0b60e6f3..3cd2818a 100644
--- a/bacnet-stack/demo/handler/s_cov.c
+++ b/bacnet-stack/demo/handler/s_cov.c
@@ -129,7 +129,7 @@ uint8_t Send_COV_Subscribe(
             &npdu_data);
         /* encode the APDU portion of the packet */
         len =
-            cov_subscribe_encode_adpu(&Handler_Transmit_Buffer[pdu_len],
+            cov_subscribe_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
             invoke_id, cov_data);
         pdu_len += len;
         /* will it fit in the sender?
diff --git a/bacnet-stack/demo/handler/s_lso.c b/bacnet-stack/demo/handler/s_lso.c
index bc518144..098041b9 100644
--- a/bacnet-stack/demo/handler/s_lso.c
+++ b/bacnet-stack/demo/handler/s_lso.c
@@ -79,7 +79,7 @@ uint8_t Send_Life_Safety_Operation_Data(
             npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address,
             &npdu_data);
         len =
-            lso_encode_adpu(&Handler_Transmit_Buffer[pdu_len], invoke_id,
+            lso_encode_apdu(&Handler_Transmit_Buffer[pdu_len], invoke_id,
             data);
         pdu_len += len;
         /* will it fit in the sender?
diff --git a/bacnet-stack/include/lso.h b/bacnet-stack/include/lso.h
index e512b9a4..ccd4fd69 100644
--- a/bacnet-stack/include/lso.h
+++ b/bacnet-stack/include/lso.h
@@ -44,7 +44,7 @@ extern "C" {
     } BACNET_LSO_DATA;
 
 
-    int lso_encode_adpu(
+    int lso_encode_apdu(
         uint8_t * apdu,
         uint8_t invoke_id,
         BACNET_LSO_DATA * data);
diff --git a/bacnet-stack/src/lso.c b/bacnet-stack/src/lso.c
index f08384ac..6ad4d27f 100644
--- a/bacnet-stack/src/lso.c
+++ b/bacnet-stack/src/lso.c
@@ -37,7 +37,7 @@
 
 /** @file lso.c  BACnet Life Safety Operation encode/decode */
 
-int lso_encode_adpu(
+int lso_encode_apdu(
     uint8_t * apdu,
     uint8_t invoke_id,
     BACNET_LSO_DATA * data)
@@ -60,7 +60,7 @@ int lso_encode_adpu(
             &data->requestingSrc);
         apdu_len += len;
         /*
-           Operation                    
+           Operation
          */
         len = encode_context_enumerated(&apdu[apdu_len], 2, data->operation);
         apdu_len += len;
@@ -158,7 +158,7 @@ void testLSO(
     data.targetObject.instance = 0x1000;
     data.targetObject.type = OBJECT_BINARY_INPUT;
 
-    len = lso_encode_adpu(apdu, 100, &data);
+    len = lso_encode_apdu(apdu, 100, &data);
 
     lso_decode_service_request(&apdu[4], len, &rxdata);