diff --git a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp
index 152b5bdf..26e50c24 100644
--- a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp
+++ b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp
@@ -25,7 +25,7 @@ static const char* evga_v3_zone_names[] =
     @save :white_check_mark:
     @direct :white_check_mark:
     @effects :white_check_mark:
-    @detectors DetectEVGAGPUControllers
+    @detectors DetectEVGAAmpereGPUControllers
     @comment EVGA has not exposed a per LED control method yet so OpenRGB
         is only able to set all LED's to a single color.
 \*-------------------------------------------------------------------*/
diff --git a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp
index 4c350a09..e5b8c56b 100644
--- a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp
+++ b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp
@@ -16,7 +16,7 @@
     @save :white_check_mark:
     @direct :white_check_mark:
     @effects :white_check_mark:
-    @detectors DetectEVGAGPUControllers
+    @detectors DetectEVGATuringGPUControllers
     @comment
 \*-------------------------------------------------------------------*/
 
diff --git a/scripts/build-supported-devices-md.sh b/scripts/build-supported-devices-md.sh
index c9317c7b..833bec94 100755
--- a/scripts/build-supported-devices-md.sh
+++ b/scripts/build-supported-devices-md.sh
@@ -13,7 +13,8 @@ OPENRGB_PATH=$1
 CONTROLLER_PATH=${OPENRGB_PATH}'/Controllers'
 DATA_TABLE_HEAD='| Controller Name | Connection | Save to Flash | Direct | Hardware Effects |\n'
 DATA_TABLE_ALIGN='| :--- | :---: | :---: | :---: | :---: |'
-DEVICE_TABLE_HEAD='| VID | PID | Device Name |\n'
+USB_DEVICE_TABLE_HEAD='| Vendor ID | Product ID | Device Name |\n'
+GPU_DEVICE_TABLE_HEAD='| Vendor &<br/>Device ID | Sub-Vendor &<br/>Product ID | Device Name |\n'
 DEVICE_TABLE_ALIGN='| :---: | :---: | :--- |'
 MAIN_FILE='Supported Devices.md'
 
@@ -44,7 +45,7 @@ echo -e "- [Coolers](#coolers)" >> "$MAIN_FILE"
 echo -e "- [LED Strips](#led-strips)" >> "$MAIN_FILE"
 echo -e "- [Keyboards](#keyboards)" >> "$MAIN_FILE"
 echo -e "- [Microphones](#microphones)" >> "$MAIN_FILE"
-echo -e "- [Mice](#mouse)" >> "$MAIN_FILE"
+echo -e "- [Mice](#mice)" >> "$MAIN_FILE"
 echo -e "- [Mouse Mats](#mouse-mats)" >> "$MAIN_FILE"
 echo -e "- [Headsets](#headsets)" >> "$MAIN_FILE"
 echo -e "- [Headset Stands](#headset-stands)" >> "$MAIN_FILE"
@@ -181,7 +182,11 @@ do
         echo -e "## Saving\n ${save_title}\n" >> "$outfile"
         echo -e "## Direct Mode\n ${direct_title}\n" >> "$outfile"
         echo -e "## Hardware Effects\n ${effects_title}\n" >> "$outfile"
-        echo -e "## Device List\n\n${DEVICE_TABLE_HEAD}${DEVICE_TABLE_ALIGN}" >> "$outfile"
+        if [[ $categories = GPU ]]; then
+            echo -e "## Device List\n\n${GPU_DEVICE_TABLE_HEAD}${DEVICE_TABLE_ALIGN}" >> "$outfile"
+        else
+            echo -e "## Device List\n\n${USB_DEVICE_TABLE_HEAD}${DEVICE_TABLE_ALIGN}" >> "$outfile"
+        fi
 
         ## Iterate over the comma seperated detector function list
         while read -r detector
@@ -219,7 +224,7 @@ do
                         spid=${spid/0x/}
                         device_name=${device_name//[^[:alnum:][:blank:]]/}
 
-                        table_row=$(printf '| `%s:%s` | `%s:%s` | %s |' "${vid}" "${pid/ /}" "${svid}" "${spid/ /}" "${device_name}")
+                        table_row=$(printf '| `%s:%s` | `%s:%s` | %s |' "${vid/ /}" "${pid/ /}" "${svid/ /}" "${spid/ /}" "${device_name}")
                         ;;
                     *)
                         table_row=""