diff --git a/inventory-app/common.py b/inventory-app/common.py
index 65ad9b6..25f4249 100644
--- a/inventory-app/common.py
+++ b/inventory-app/common.py
@@ -76,12 +76,12 @@ def inventory_fetch(owner=True, item_type=None):
 
 def format_name(item):
     if item.get("locker"):
-        return "Locker %d" % item.get("locker").get("number")
+        return "Locker %d".format(item.get("locker").get("number"))
     elif item.get("mac"):
-        return "Machine %s" % item.get("hostname", item.get("mac"))
+        return "Machine {} ({})".format(item.get("name", "unidentified"), item.get("mac"))
     elif item.get("desk"):
-        return "Desk %s" % item.get("desk").get("number")
-    return item.get("name", "Unknown item")
+        return "Desk %s".format(item.get("desk").get("number"))
+    return item.get("name", "Unidentified item")
 
 def flatten(d, parent_key='', sep='.'):
     items = []