diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index 41f24448..5866478a 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -193,14 +193,14 @@
 /* Product string for Audio Class 2.0 mode */
 #ifndef PRODUCT_STR_A2
 #warning PRODUCT_STR_A2 not defined. Using default string
-#define PRODUCT_STR_A2             "xCORE USB Audio 2.0 "
+#define PRODUCT_STR_A2             "xCORE USB Audio 2.0"
 #endif
 
 
 /* Product string for Audio Class 1.0 mode */
 #ifndef PRODUCT_STR_A1
 #warning PRODUCT_STR_A1 not defined. Using default string
-#define PRODUCT_STR_A1             "xCORE USB Audio 1.0 "
+#define PRODUCT_STR_A1             "xCORE USB Audio 1.0"
 #endif
 
 #if (AUDIO_CLASS==1) || defined(AUDIO_CLASS_FALLBACK)
diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index 2f7786ae..2d5e4f35 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -1432,11 +1432,11 @@ unsigned char cfgDesc_Audio2[] =
 #define STR_INDEX_OUT_CHAN  (10 + SPDIF_RX_NUM_STRS + ADAT_RX_NUM_STRS + MIDI_NUM_STRS + DFU_NUM_STRS)
 #define STR_INDEX_IN_CHAN   (STR_INDEX_OUT_CHAN + NUM_USB_CHAN_OUT)
 
-#define APPEND_VENDOR_STR(x) VENDOR_STR " "#x
+#define APPEND_VENDOR_STR(x) VENDOR_STR#x
 
-#define APPEND_PRODUCT_STR_A2(x) PRODUCT_STR_A2 " " #x
+#define APPEND_PRODUCT_STR_A2(x) PRODUCT_STR_A2 " "#x
 
-#define APPEND_PRODUCT_STR_A1(x) PRODUCT_STR_A1 " " #x
+#define APPEND_PRODUCT_STR_A1(x) PRODUCT_STR_A1 " "#x
 
 #if defined(SPDIF) 
 #if ((NUM_USB_CHAN_OUT - 2) <= 0) 
@@ -1449,7 +1449,7 @@ unsigned char cfgDesc_Audio2[] =
 static unsigned char strDescs[][40] = 
 {
     "Langids",						            // 0     LangIDs place holder
-    APPEND_VENDOR_STR( ),                       // 1     iManufacturer (at MANUFACTURER_STRING_INDEX)
+    APPEND_VENDOR_STR(),                       // 1     iManufacturer (at MANUFACTURER_STRING_INDEX)
 
     "",//SERIAL_STR,                            // 2     iSerialNumber (at SERIAL_STR_INDEX)