diff --git a/src/capwap/Makefile b/src/capwap/Makefile
index a07b1b25..082ecdad 100644
--- a/src/capwap/Makefile
+++ b/src/capwap/Makefile
@@ -164,6 +164,7 @@ CAPWAPOBJS= \
 	cw_strlist_get_str.o \
 	capwap_strings_msg.o \
 	capwap_strings_state.o \
+	capwap_strings_vendor.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 eefe7d4e..7e3bb0a4 100644
--- a/src/capwap/capwap.h
+++ b/src/capwap/capwap.h
@@ -709,8 +709,11 @@ struct cw_strlist {
 extern const char * cw_strlist_get_str(struct cw_strlist *s,int id);
 
 
+/* Constants to string conversion lists */
 extern struct cw_strlist capwap_strings_msg[];
 extern struct cw_strlist capwap_strings_state[];
+extern struct cw_strlist capwap_strings_vendor[];
+
 
 #define cw_strmsg(id) cw_strlist_get_str(capwap_strings_msg,id)
 #define cw_strstate(id) cw_strlist_get_str(capwap_strings_state,id)
diff --git a/src/capwap/cw_in_wtp_name.c b/src/capwap/cw_in_wtp_name.c
index deaf49e3..63e7742d 100644
--- a/src/capwap/cw_in_wtp_name.c
+++ b/src/capwap/cw_in_wtp_name.c
@@ -6,22 +6,9 @@
 
 int cw_in_wtp_name(struct conn *conn,struct cw_action * a,uint8_t *data,int len)
 {
-	int i;
-	
-	printf("WTP Name: ");
-	for (i=0; i<len; i++) {
-		printf("%c",data[i]);
-	}
-	printf("\n");
-
 	if (len > 512){
 		cw_dbg(DBG_CW_RFC, "WTP Name too long, must not exceed 512, len is %d",len);
 	}
-
-
-
 	cw_itemstore_set_strn(conn->itemstore,CW_ITEM_WTP_NAME,(const char*)data,len);
 	return 1;
 }
-
-