diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 6362f521..17101ac9 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -218,8 +218,8 @@
 #define CW_ELEM_CAPWAP_CONTROL_IPV4_ADDRESS		10
 #define CW_ELEM_CAPWAP_CONTROL_IPV6_ADDRESS		11
 /**@}*/
-#define CW_ELEM_CAPWAP_LOCAL_IPV4_ADDRESS		30
-#define CW_ELEM_CAPWAP_LOCAL_IPV6_ADDRESS		50
+#define CAPWAP_ELEM_CAPWAP_LOCAL_IPV4_ADDRESS		30
+#define CAPWAP_ELEM_CAPWAP_LOCAL_IPV6_ADDRESS		50
 #define CW_ELEM_CAPWAP_TIMERS				12
 #define CW_ELEM_CAPWAP_TRANSPORT_PROTOCOL		51	/* not in draft 7 */
 #define CW_ELEM_DATA_TRANSFER_DATA			13
@@ -242,7 +242,7 @@
 #define CW_ELEM_IMAGE_INFORMATION			26
 #define CW_ELEM_INITIATE_DOWNLOAD			27
 #define CAPWAP_ELEM_LOCATION_DATA			28
-#define CW_ELEM_MAXIMUM_MESSAGE_LENGTH			29
+#define CAPWAP_ELEM_MAXIMUM_MESSAGE_LENGTH		29
 #define CAPWAP_ELEM_MTU_DISCOVERY_PADDING		52
 #define CW_ELEM_RADIO_ADMINISTRATIVE_STATE		31
 #define CW_ELEM_RADIO_OPERATIONAL_STATE			32