diff --git a/src/ac/conf.c b/src/ac/conf.c
index d538c3cc..f878678b 100644
--- a/src/ac/conf.c
+++ b/src/ac/conf.c
@@ -620,7 +620,7 @@ int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *pr
 	char *ctrlport;
 	switch (*proto) {
 		case AC_PROTO_CAPWAP:
-			ctrlport = CW_CONTROL_PORT_STR;
+			ctrlport = CAPWAP_CONTROL_PORT_STR;
 			break;
 		case AC_PROTO_LWAPP:
 			ctrlport = LWAPP_CONTROL_PORT_STR;
diff --git a/src/ac/conf.h b/src/ac/conf.h
index 5d7c9ecb..54e4bd85 100644
--- a/src/ac/conf.h
+++ b/src/ac/conf.h
@@ -69,7 +69,7 @@ extern struct mod_ac ** conf_mods;
 
 
 #ifndef CONF_DEFAULT_CONTROL_PORT
-#define	CONF_DEFAULT_CONTROL_PORT CW_CONTROL_PORT
+#define	CONF_DEFAULT_CONTROL_PORT CAPWAP_CONTROL_PORT
 #endif
 
 #ifndef CONF_DEFAULT_LW_CONTROL_PORT
diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 5abe9ced..68325af6 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -48,12 +48,12 @@
 /** CAPWAP Version */
 #define CAPWAP_VERSION (0)
 
-#define CW_IANA_ENTERPRISE_NUMBER 0
+#define CAPWAP_IANA_ENTERPRISE_NUMBER 0
 
 /** CAPWAP Control Port*/
-#define CW_CONTROL_PORT 5246
+#define CAPWAP_CONTROL_PORT 5246
 /** CAPWAP Control Port as String */
-#define CW_CONTROL_PORT_STR "5246"
+#define CAPWAP_CONTROL_PORT_STR "5246"
 
 /** CAPWAP Data Port */
 #define CAPWAP_DATA_PPORT 5247
diff --git a/src/cw/cw_in_capwap_control_ip_address.c b/src/cw/cw_in_capwap_control_ip_address.c
index c20c08f2..ed03ba6a 100644
--- a/src/cw/cw_in_capwap_control_ip_address.c
+++ b/src/cw/cw_in_capwap_control_ip_address.c
@@ -62,7 +62,7 @@ int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
 		struct sockaddr_in addr;
 		memcpy(&addr.sin_addr,data,4);
 		addr.sin_family=AF_INET;
-		sock_setport((struct sockaddr*)&addr,CW_CONTROL_PORT);
+		sock_setport((struct sockaddr*)&addr,CAPWAP_CONTROL_PORT);
 		memcpy(&acip->ip,&addr,sizeof(addr));
 		acip->index = cw_get_word(data+4);
 	}
@@ -72,7 +72,7 @@ int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
 		memset (&addr,0,sizeof(addr));
 		memcpy(&addr.sin6_addr,data,16);
 		addr.sin6_family=AF_INET6;
-		sock_setport((struct sockaddr*)&addr,CW_CONTROL_PORT);
+		sock_setport((struct sockaddr*)&addr,CAPWAP_CONTROL_PORT);
 		memcpy(&acip->ip,&addr,sizeof(addr));
 		acip->index = cw_get_word(data+16);
 	}
diff --git a/src/wtp/wtp_conf.c b/src/wtp/wtp_conf.c
index 2e18d902..8c85c95d 100644
--- a/src/wtp/wtp_conf.c
+++ b/src/wtp/wtp_conf.c
@@ -209,7 +209,7 @@ int wtpconf_ac_list()
 
 int wtpconf_preinit()
 {
-	conf_control_port=strdup(CW_CONTROL_PORT_STR);
+	conf_control_port=strdup(CAPWAP_CONTROL_PORT_STR);
 	conf_dtls_cipher=strdup(CONF_DEFAULT_DTLS_CIPHER);