diff --git a/MeshtasticApple/Views/Bluetooth/Connect.swift b/MeshtasticApple/Views/Bluetooth/Connect.swift
index 98578eea..ec6743a3 100644
--- a/MeshtasticApple/Views/Bluetooth/Connect.swift
+++ b/MeshtasticApple/Views/Bluetooth/Connect.swift
@@ -265,8 +265,8 @@ struct Connect: View {
                     ConnectedDevice(
 						bluetoothOn: self.bleManager.isSwitchedOn,
 						deviceConnected: self.bleManager.connectedPeripheral != nil,
-						name: (bleManager.connectedPeripheral != nil) ? self.bleManager.connectedPeripheral.lastFourCode :
-							"????")
+						name: (bleManager.connectedPeripheral != nil) ? self.bleManager.connectedPeripheral.shortName :
+							"?????")
                 }
             )
         }
diff --git a/MeshtasticApple/Views/Messages/UserMessageList.swift b/MeshtasticApple/Views/Messages/UserMessageList.swift
index d70a18ec..c6dfd2d1 100644
--- a/MeshtasticApple/Views/Messages/UserMessageList.swift
+++ b/MeshtasticApple/Views/Messages/UserMessageList.swift
@@ -457,7 +457,7 @@ struct UserMessageList: View {
 					ConnectedDevice(
 						bluetoothOn: bleManager.isSwitchedOn,
 						deviceConnected: bleManager.connectedPeripheral != nil,
-						name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+						name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 				}
 			}
 		}
diff --git a/MeshtasticApple/Views/Nodes/NodeDetail.swift b/MeshtasticApple/Views/Nodes/NodeDetail.swift
index 5d7a3699..6369b514 100644
--- a/MeshtasticApple/Views/Nodes/NodeDetail.swift
+++ b/MeshtasticApple/Views/Nodes/NodeDetail.swift
@@ -352,7 +352,7 @@ struct NodeDetail: View {
 				ConnectedDevice(
 					bluetoothOn: bleManager.isSwitchedOn,
 					deviceConnected: bleManager.connectedPeripheral != nil,
-					name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+					name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 			}
 		)
 		.onAppear(perform: {
diff --git a/MeshtasticApple/Views/Nodes/NodeMap.swift b/MeshtasticApple/Views/Nodes/NodeMap.swift
index 0aa4516d..061852db 100644
--- a/MeshtasticApple/Views/Nodes/NodeMap.swift
+++ b/MeshtasticApple/Views/Nodes/NodeMap.swift
@@ -125,8 +125,8 @@ struct NodeMap: View {
 				ConnectedDevice(
 					bluetoothOn: bleManager.isSwitchedOn,
 					deviceConnected: bleManager.connectedPeripheral != nil,
-					name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode :
-						"????")
+					name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName :
+						"?????")
 			})
 			.onAppear(perform: {
 
diff --git a/MeshtasticApple/Views/Settings/AppSettings.swift b/MeshtasticApple/Views/Settings/AppSettings.swift
index e5c14e1a..6e6aa954 100644
--- a/MeshtasticApple/Views/Settings/AppSettings.swift
+++ b/MeshtasticApple/Views/Settings/AppSettings.swift
@@ -176,7 +176,7 @@ struct AppSettings: View {
 
 			ZStack {
 
-				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+			ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 		})
 		.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/DeviceConfig.swift b/MeshtasticApple/Views/Settings/DeviceConfig.swift
index ae734c68..148c42bb 100644
--- a/MeshtasticApple/Views/Settings/DeviceConfig.swift
+++ b/MeshtasticApple/Views/Settings/DeviceConfig.swift
@@ -79,7 +79,7 @@ struct DeviceConfig: View {
 
 				ZStack {
 
-					ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 			})
 			.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/DisplayConfig.swift b/MeshtasticApple/Views/Settings/DisplayConfig.swift
index 35e4ce92..d7c9936f 100644
--- a/MeshtasticApple/Views/Settings/DisplayConfig.swift
+++ b/MeshtasticApple/Views/Settings/DisplayConfig.swift
@@ -163,7 +163,7 @@ struct DisplayConfig: View {
 
 			ZStack {
 
-				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+			ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 		})
 		.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/LoRaConfig.swift b/MeshtasticApple/Views/Settings/LoRaConfig.swift
index f17e66d9..a2e706a8 100644
--- a/MeshtasticApple/Views/Settings/LoRaConfig.swift
+++ b/MeshtasticApple/Views/Settings/LoRaConfig.swift
@@ -149,7 +149,7 @@ struct LoRaConfig: View {
 
 			ZStack {
 
-				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+			ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 		})
 		.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/PositionConfig.swift b/MeshtasticApple/Views/Settings/PositionConfig.swift
index 43cf0af4..ffb675e4 100644
--- a/MeshtasticApple/Views/Settings/PositionConfig.swift
+++ b/MeshtasticApple/Views/Settings/PositionConfig.swift
@@ -239,7 +239,7 @@ struct PositionConfig: View {
 
 			ZStack {
 
-				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+			ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 		})
 		.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/RangeTestConfig.swift b/MeshtasticApple/Views/Settings/RangeTestConfig.swift
index 0723954e..ef86378a 100644
--- a/MeshtasticApple/Views/Settings/RangeTestConfig.swift
+++ b/MeshtasticApple/Views/Settings/RangeTestConfig.swift
@@ -55,7 +55,7 @@ struct RangeTestConfig: View {
 
 				ZStack {
 
-					ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+					ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 			})
 			.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/ShareChannel.swift b/MeshtasticApple/Views/Settings/ShareChannel.swift
index 7b41486b..3a7b2bfe 100644
--- a/MeshtasticApple/Views/Settings/ShareChannel.swift
+++ b/MeshtasticApple/Views/Settings/ShareChannel.swift
@@ -81,7 +81,7 @@ struct ShareChannel: View {
 
 				ZStack {
 
-					ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 			})
 			.onAppear {
 
diff --git a/MeshtasticApple/Views/Settings/TelemetryConfig.swift b/MeshtasticApple/Views/Settings/TelemetryConfig.swift
index aa22679f..78eb78a6 100644
--- a/MeshtasticApple/Views/Settings/TelemetryConfig.swift
+++ b/MeshtasticApple/Views/Settings/TelemetryConfig.swift
@@ -26,7 +26,7 @@ struct TelemetryConfig: View {
 
 				ZStack {
 
-					ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.lastFourCode : "????")
+				ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?????")
 			})
 			.onAppear {