diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 0e6e4a52..44d75d44 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -240,7 +240,7 @@
 #define CW_ELEM_IMAGE_IDENTIFIER			25
 #define CW_ELEM_IMAGE_INFORMATION			26
 #define CW_ELEM_INITIATE_DOWNLOAD			27
-#define CW_ELEM_LOCATION_DATA				28
+#define CAPWAP_ELEM_LOCATION_DATA			28
 #define CW_ELEM_MAXIMUM_MESSAGE_LENGTH			29
 #define CAPWAP_ELEM_MTU_DISCOVERY_PADDING		52
 #define CW_ELEM_RADIO_ADMINISTRATIVE_STATE		31
@@ -346,6 +346,8 @@
 
 #define CW_SESSION_ID_LEN	16
 #define CAPWAP_MAX_AC_NAME_LEN		512
+#define CAPWAP_MAX_WTP_NAME_LEN		512
+#define CAPWAP_MAX_LOCATION_DATA_LEN	1024
 
 
 /* capwap timer default values */