diff --git a/data/bluetooth_data.py b/data/bluetooth_data.py
index 5d4faa989..da76bf238 100644
--- a/data/bluetooth_data.py
+++ b/data/bluetooth_data.py
@@ -3,13 +3,13 @@ import enum
 
 class bluetooth_data(enum.IntEnum):
     # Bluetooth Chipsets
-    NonApplicable = 0
-    BRCM2045 = 1  # TODO: Rename chipset, currently guessing MacPro1,1-3,1 name
-    BRCM2046 = 2  # BT 2.1
-    BRCM2070 = 3  # BT 2.1
-    BRCM20702_v1 = 4  # BT 4.0 - 2012
-    BRCM20702_v2 = 5  # BT 4.0 - 2013+
-    BRCM20703 = 6  # BT 4.2
-    BRCM20703_UART = 9  # BRCM20703 over UART, BT 4.2
-    UART = 10  # T2
-    PCIe = 20  # Apple Silicon
+    NonApplicable =   0
+    APPLE_CSR =       1  # BT 2.0 - Apple rebranded CSR chipset
+    BRCM2046 =        2  # BT 2.1
+    BRCM2070 =        3  # BT 2.1
+    BRCM20702_v1 =    4  # BT 4.0 - 2011/2012
+    BRCM20702_v2 =    5  # BT 4.0 - 2013+
+    BRCM20703 =       6  # BT 4.2
+    BRCM20703_UART =  9  # BRCM20703 over UART, BT 4.2
+    UART =           10  # T2
+    PCIe =           20  # Apple Silicon
diff --git a/data/smbios_data.py b/data/smbios_data.py
index 15dfb2f3c..9a657d992 100644
--- a/data/smbios_data.py
+++ b/data/smbios_data.py
@@ -25,7 +25,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.yonah.value,
         "Max OS Supported": os_data.os_data.snow_leopard,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 13,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -45,7 +45,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 13,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -65,7 +65,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 13,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -335,7 +335,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.sandy_bridge.value,
         "Max OS Supported": os_data.os_data.high_sierra,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1,
         "Screen Size": 11,
         "Ethernet Chipset": "Broadcom",  # Set for Apple Thunderbolt Adapter
         "Stock GPUs": [
@@ -352,7 +352,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.sandy_bridge.value,
         "Max OS Supported": os_data.os_data.high_sierra,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1,
         "Screen Size": 13,
         "Ethernet Chipset": "Broadcom",  # Set for Apple Thunderbolt Adapter
         "Stock GPUs": [
@@ -591,7 +591,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.yonah.value,
         "Max OS Supported": os_data.os_data.snow_leopard,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 15,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -610,7 +610,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.yonah.value,
         "Max OS Supported": os_data.os_data.snow_leopard,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 17,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -629,7 +629,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 17,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -648,7 +648,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 15,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -667,7 +667,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.el_capitan,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 15,  # Shipped with 17 as well
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -686,7 +686,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.el_capitan,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Screen Size": 15,  # Shipped with 17 as well
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
@@ -1493,7 +1493,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.yonah.value,
         "Max OS Supported": os_data.os_data.snow_leopard,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Ethernet Chipset": "Marvell",
         "Stock GPUs": [
             device_probe.Intel.Archs.GMA_950
@@ -1510,7 +1510,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "Ethernet Chipset": "Marvell",
         "Stock GPUs": [
             device_probe.Intel.Archs.GMA_950
@@ -1561,7 +1561,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.sandy_bridge.value,
         "Max OS Supported": os_data.os_data.high_sierra,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1,
         "Ethernet Chipset": "Broadcom",
         "Stock GPUs": [
             device_probe.Intel.Archs.Sandy_Bridge
@@ -1577,7 +1577,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.sandy_bridge.value,
         "Max OS Supported": os_data.os_data.high_sierra,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1,
         "Ethernet Chipset": "Broadcom",
         "Stock GPUs": [
             device_probe.Intel.Archs.Sandy_Bridge,
@@ -1594,7 +1594,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.sandy_bridge.value,
         "Max OS Supported": os_data.os_data.high_sierra,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1,
         "Ethernet Chipset": "Broadcom",
         "Stock GPUs": [
             device_probe.Intel.Archs.Sandy_Bridge,
@@ -1689,7 +1689,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.yonah.value,
         "Max OS Supported": os_data.os_data.snow_leopard,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
         "Legacy iSight": True,
@@ -1708,7 +1708,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.yonah.value,
         "Max OS Supported": os_data.os_data.snow_leopard,
         "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "UGA Graphics": True,
         "Ethernet Chipset": "Marvell",
         "Legacy iSight": True,
@@ -2546,7 +2546,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": None,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "UGA Graphics": True,
         "Ethernet Chipset": "Intel 80003ES2LAN",
         "Socketed GPUs": "PCIe",
@@ -2565,7 +2565,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.conroe.value,
         "Max OS Supported": os_data.os_data.lion,
         "Wireless Model": None,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "UGA Graphics": True,
         "Ethernet Chipset": "Intel 80003ES2LAN",
         "Socketed GPUs": "PCIe",
@@ -2584,7 +2584,7 @@ smbios_dictionary = {
         "CPU Generation": cpu_data.cpu_data.penryn.value,
         "Max OS Supported": os_data.os_data.el_capitan,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224,
-        "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR,
         "UGA Graphics": True,
         "Ethernet Chipset": "Intel 80003ES2LAN",
         "Socketed GPUs": "PCIe",