diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 88f1bd0..851d9fd 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -426,18 +426,17 @@
                                      "fixing template to not have duplicates\n";
                     }
 
+                    getName.value() = copyIt.value();
+                    usedNames.insert(copyIt.value());
+
                     for (auto keyPair = record.begin(); keyPair != record.end();
                          keyPair++)
                     {
-                        if (keyPair.key() == "Name")
+                        if (keyPair.key() != "Name")
                         {
-                            keyPair.value() = copyIt.value();
-                            usedNames.insert(copyIt.value());
-
-                            continue; // already covered above
+                            templateCharReplace(keyPair, dbusObject,
+                                                foundDeviceIdx, replaceStr);
                         }
-                        templateCharReplace(keyPair, dbusObject, foundDeviceIdx,
-                                            replaceStr);
                     }
 
                     // insert into configuration temporarily to be able to