diff --git a/CHANGELOG.md b/CHANGELOG.md
index dece0ab41..d44980882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Amazfit Bip S: remove disconnect notification and button action settings (they do not work)
 * Fossil Hybrid HR: Add last notification widget
 * Try to fix vanishing incoming call information when VoIP call support is enabled
+* Allow setting device aliases (useful if you manage multiple ones of the same type)
 
 #### Version 0.44.1
 * Amazfit Bip S: Support setting shortcuts
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 61765c441..eed88b3e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -612,10 +612,8 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
     }
 
     private String getUniqueDeviceName(GBDevice device) {
-        String deviceName = device.getAlias();
-        if (deviceName == null || deviceName.equals("")) {
-            deviceName = device.getName();
-        }
+        String deviceName = device.getAliasOrName();
+
         if (!isUniqueDeviceName(device, deviceName)) {
             if (device.getModel() != null) {
                 deviceName = deviceName + " " + device.getModel();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
index 79151495c..f5b859b79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
@@ -22,6 +22,10 @@ import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,9 +34,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
@@ -153,6 +154,7 @@ public class GBDevice implements Parcelable {
         }
     }
 
+
     public String getName() {
         return mName;
     }
@@ -161,6 +163,13 @@ public class GBDevice implements Parcelable {
         return mAlias;
     }
 
+    public String getAliasOrName() {
+        if (mAlias != null && !mAlias.equals("")) {
+            return mAlias;
+        }
+        return mName;
+    }
+
     public void setName(String name) {
         if (name == null) {
             LOG.warn("Ignoring setting of GBDevice name to null for " + this);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
index 628b2e0c6..a9dd5ee14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
@@ -91,7 +91,7 @@ public class GB {
     }
 
     public static Notification createNotification(GBDevice device, Context context) {
-        String deviceName = device.getName();
+        String deviceName = device.getAliasOrName();
         String text = device.getStateString();
         if (device.getBatteryLevel() != GBDevice.BATTERY_UNKNOWN) {
             text += ": " + context.getString(R.string.battery) + " " + device.getBatteryLevel() + "%";