diff --git a/bacnet-stack/bacstr.h b/bacnet-stack/bacstr.h
index 52637002..01989a04 100644
--- a/bacnet-stack/bacstr.h
+++ b/bacnet-stack/bacstr.h
@@ -68,9 +68,9 @@ extern "C" {
 #endif                          /* __cplusplus */
 
     void bitstring_init(BACNET_BIT_STRING * bit_string);
-    void bitstring_set_bit(BACNET_BIT_STRING * bit_string, uint8_t bit,
+    void bitstring_set_bit(BACNET_BIT_STRING * bit_string, uint8_t bit_number,
         bool value);
-    bool bitstring_bit(BACNET_BIT_STRING * bit_string, uint8_t bit);
+    bool bitstring_bit(BACNET_BIT_STRING * bit_string, uint8_t bit_number);
     uint8_t bitstring_bits_used(BACNET_BIT_STRING * bit_string);
 /* returns the number of bytes that a bit string is using */
     int bitstring_bytes_used(BACNET_BIT_STRING * bit_string);
diff --git a/bacnet-stack/wp.h b/bacnet-stack/wp.h
index 57614039..ffecad77 100644
--- a/bacnet-stack/wp.h
+++ b/bacnet-stack/wp.h
@@ -59,17 +59,17 @@ extern "C" {
 
 /* encode service */
     int wp_encode_apdu(uint8_t * apdu,
-        uint8_t invoke_id, BACNET_WRITE_PROPERTY_DATA * data);
+        uint8_t invoke_id, BACNET_WRITE_PROPERTY_DATA * wp_data);
 
 /* decode the service request only */
     int wp_decode_service_request(uint8_t * apdu,
-        unsigned apdu_len, BACNET_WRITE_PROPERTY_DATA * data);
+        unsigned apdu_len, BACNET_WRITE_PROPERTY_DATA * wp_data);
 
 #ifdef TEST
 #include "ctest.h"
     int wp_decode_apdu(uint8_t * apdu,
         unsigned apdu_len,
-        uint8_t * invoke_id, BACNET_WRITE_PROPERTY_DATA * data);
+        uint8_t * invoke_id, BACNET_WRITE_PROPERTY_DATA * wp_data);
 
     void test_ReadProperty(Test * pTest);
     void test_ReadPropertyAck(Test * pTest);