diff --git a/src/capwap/Makefile b/src/capwap/Makefile
index 6c21c600..a07b1b25 100644
--- a/src/capwap/Makefile
+++ b/src/capwap/Makefile
@@ -162,8 +162,8 @@ CAPWAPOBJS= \
 	cw_readelem_cisco_wtp_radio_cfg.o \
 	cw_addelem_cisco_wtp_radio_cfg.o \
 	cw_strlist_get_str.o \
-	capwap_msg_strings.o \
-	capwap_state_strings.o \
+	capwap_strings_msg.o \
+	capwap_strings_state.o \
 	itemstore.o \
 	cw_in_vendor_specific_payload.o \
 	cw_in_wtp_name.o \
diff --git a/src/capwap/capwap.h b/src/capwap/capwap.h
index 53da6c09..eefe7d4e 100644
--- a/src/capwap/capwap.h
+++ b/src/capwap/capwap.h
@@ -709,11 +709,11 @@ struct cw_strlist {
 extern const char * cw_strlist_get_str(struct cw_strlist *s,int id);
 
 
-extern struct cw_strlist capwap_msg_strings[];
-extern struct cw_strlist capwap_state_strings[];
+extern struct cw_strlist capwap_strings_msg[];
+extern struct cw_strlist capwap_strings_state[];
 
-#define cw_strmsg(id) cw_strlist_get_str(capwap_msg_strings,id)
-#define cw_strstate(id) cw_strlist_get_str(capwap_state_strings,id)
+#define cw_strmsg(id) cw_strlist_get_str(capwap_strings_msg,id)
+#define cw_strstate(id) cw_strlist_get_str(capwap_strings_state,id)
 
 
 int cw_process_msg(struct conn * conn,uint8_t * rawmsg,int len);
diff --git a/src/capwap/capwap_msg_strings.c b/src/capwap/capwap_msg_strings.c
deleted file mode 100644
index b844305a..00000000
--- a/src/capwap/capwap_msg_strings.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "capwap.h"
-
-struct cw_strlist capwap_msg_strings[] = {
-{ CW_MSG_DISCOVERY_REQUEST, "Discovery Request" },
-{ CW_MSG_DISCOVERY_RESPONSE,"Discovery Response" },
-{ CW_MSG_JOIN_REQUEST, "Join Request"},
-{ CW_MSG_JOIN_RESPONSE,"Join Response"},
-{ CW_MSG_CONFIGURATION_STATUS_REQUEST,"Configuration Request"},
-{ CW_MSG_CONFIGURATION_STATUS_RESPONSE,"Configuration Response"},
-{ CW_MSG_CONFIGURATION_UPDATE_REQUEST,"Update Request"},
-{ CW_MSG_CONFIGURATION_UPDATE_RESPONSE,"Update Response"},
-{ CW_MSG_WTP_EVENT_REQUEST,"WTP Event Request"},
-{ CW_MSG_WTP_EVENT_RESPONSE,"WTP Event Response"},
-{ CW_MSG_CHANGE_STATE_EVENT_REQUEST,"Change State Event Request"},
-{ CW_MSG_CHANGE_STATE_EVENT_RESPONSE,"Change State Event Response"},
-{ CW_MSG_ECHO_REQUEST,"Echo Request"},
-{ CW_MSG_ECHO_RESPONSE,"Echo Response"},
-{ CW_MSG_IMAGE_DATA_REQUEST,"Image Data Request"},
-{ CW_MSG_IMAGE_DATA_RESPONSE,"Image Data Response"},
-{ CW_MSG_RESET_REQUEST,"Reset Request"},
-{ CW_MSG_RESET_RESPONSE,"Reset Response"},
-{ CW_MSG_PRIMARY_DISCOVERY_REQUEST,"Primary Discovery Request"},
-{ CW_MSG_PRIMARY_DISCOVERY_RESPONSE,"Primary Discovery Response"},
-
-/*           Data Transfer Request               21
-           Data Transfer Response              22
-           Clear Configuration Request         23
-           Clear Configuration Response        24
-           Station Configuration Request       25
-           Station Configuration Response      26
-*/
-
-{0,"Unknown Message Type"}
-
-};
-
-
diff --git a/src/capwap/capwap_state_strings.c b/src/capwap/capwap_state_strings.c
deleted file mode 100644
index 3d6c99db..00000000
--- a/src/capwap/capwap_state_strings.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "capwap.h"
-
-struct cw_strlist capwap_state_strings[] = {
-{ CW_STATE_DISCOVERY, "Discovery" },
-{ CW_STATE_JOIN,"Join" },
-{ CW_STATE_RUN,"Run" },
-{ 0,"Undefined" }
-};