diff --git a/data/device-tests/devices/8bitdo-nes30pro.json b/data/device-tests/devices/8bitdo-nes30pro.json
index 258e191dc..d4aa98832 100644
--- a/data/device-tests/devices/8bitdo-nes30pro.json
+++ b/data/device-tests/devices/8bitdo-nes30pro.json
@@ -1,5 +1,5 @@
 {
-  "name": "8Bitdo NES30Pro",
+  "name": "8BitDo NES30Pro",
   "guids": [
     "c6566b1b-0c6e-5d2e-9376-78c23ab57bf2"
   ],
diff --git a/data/device-tests/devices/8bitdo-sf30pro.json b/data/device-tests/devices/8bitdo-sf30pro.json
index 3b50c07e6..a984fd681 100644
--- a/data/device-tests/devices/8bitdo-sf30pro.json
+++ b/data/device-tests/devices/8bitdo-sf30pro.json
@@ -1,5 +1,5 @@
 {
-  "name": "8Bitdo SF30Pro",
+  "name": "8BitDo SF30Pro",
   "guids": [
     "269b3121-097b-50d8-b9ba-d1f64f9cd241"
   ],
diff --git a/data/device-tests/devices/8bitdo-sfc30.json b/data/device-tests/devices/8bitdo-sfc30.json
index 1bbeac8b9..00147d99f 100644
--- a/data/device-tests/devices/8bitdo-sfc30.json
+++ b/data/device-tests/devices/8bitdo-sfc30.json
@@ -1,5 +1,5 @@
 {
-  "name": "8Bitdo SFC30",
+  "name": "8BitDo SFC30",
   "guids": [
     "a7fcfbaf-e9e8-59f4-920d-7691dc6c8699"
   ],
diff --git a/data/org.freedesktop.fwupd.metainfo.xml b/data/org.freedesktop.fwupd.metainfo.xml
index 3daa7bf87..8853973f0 100644
--- a/data/org.freedesktop.fwupd.metainfo.xml
+++ b/data/org.freedesktop.fwupd.metainfo.xml
@@ -1176,7 +1176,7 @@
           <li>Catch invalid Dell dock component requests</li>
           <li>Correctly output Intel HEX files with &gt; 16bit offset addresses</li>
           <li>Do not try to verify the element write if upload is unsupported</li>
-          <li>Fix a double-unref when updating any 8Bitdo device</li>
+          <li>Fix a double-unref when updating any 8BitDo device</li>
           <li>Fix crash when enumerating with Dell dock connected but with no UEFI</li>
           <li>Fix uploading large firmware files over DFU</li>
           <li>Format the BCD USB revision numbers correctly</li>
@@ -1189,7 +1189,7 @@
             fwupdmgr
           </li>
           <li>Use the correct wDetachTimeOut when writing DFU firmware</li>
-          <li>Verify devices with legacy VIDs are actually 8Bitdo controllers</li>
+          <li>Verify devices with legacy VIDs are actually 8BitDo controllers</li>
         </ul>
       </description>
     </release>
diff --git a/plugins/ebitdo/README.md b/plugins/ebitdo/README.md
index fcd8ffdc2..3cdcd7968 100644
--- a/plugins/ebitdo/README.md
+++ b/plugins/ebitdo/README.md
@@ -1,15 +1,15 @@
-8Bitdo Support
+8BitDo Support
 ==============
 
 Introduction
 ------------
 
-This plugin can flash the firmware on the 8Bitdo game pads.
+This plugin can flash the firmware on the 8BitDo game pads.
 
 Ebitdo support is supported directly by this project with the embedded libebitdo
 library and is possible thanks to the vendor open sourcing the flashing tool.
 
-The 8Bitdo devices share legacy USB VID/PIDs with other projects and so we have
+The 8BitDo devices share legacy USB VID/PIDs with other projects and so we have
 to be a bit careful to not claim other devices as our own.
 
 Firmware Format
diff --git a/plugins/ebitdo/fu-ebitdo-device.c b/plugins/ebitdo/fu-ebitdo-device.c
index e29d8cfdd..91187e683 100644
--- a/plugins/ebitdo/fu-ebitdo-device.c
+++ b/plugins/ebitdo/fu-ebitdo-device.c
@@ -262,7 +262,7 @@ fu_ebitdo_device_validate (FuEbitdoDevice *self, GError **error)
 		     G_IO_ERROR,
 		     G_IO_ERROR_INVALID_DATA,
 		     "vendor '%s' did not match allowlist, "
-		     "probably not a 8Bitdo device…", ven);
+		     "probably not a 8BitDo device…", ven);
 	return FALSE;
 }
 
@@ -276,7 +276,7 @@ fu_ebitdo_device_open (FuDevice *device, GError **error)
 	if (!FU_DEVICE_CLASS (fu_ebitdo_device_parent_class)->open (device, error))
 		return FALSE;
 
-	/* open, then ensure this is actually 8Bitdo hardware */
+	/* open, then ensure this is actually 8BitDo hardware */
 	if (!fu_ebitdo_device_validate (self, error))
 		return FALSE;
 	if (!g_usb_device_claim_interface (usb_device, 0, /* 0 = idx? */
@@ -563,7 +563,7 @@ fu_ebitdo_device_probe (FuDevice *device, GError **error)
 
 	/* set name and vendor */
 	fu_device_set_summary (device, "A redesigned classic game controller");
-	fu_device_set_vendor (device, "8Bitdo");
+	fu_device_set_vendor (device, "8BitDo");
 
 	/* add a hardcoded icon name */
 	fu_device_add_icon (device, "input-gaming");