diff --git a/lib/aquilon/worker/templates/city.py b/lib/aquilon/worker/templates/city.py
index ed97b618c..837ff3c46 100644
--- a/lib/aquilon/worker/templates/city.py
+++ b/lib/aquilon/worker/templates/city.py
@@ -30,7 +30,7 @@ class PlenaryCity(Plenary):
 
     @classmethod
     def template_name(cls, dbcity):
-        return "%s/%s/%s/config" % (cls.prefix, dbcity.hub.fullname.lower(),
+        return "%s/%s/%s/config" % (cls.prefix, dbcity.continent.name,
                                     dbcity.name)
 
     def body(self, lines):
diff --git a/lib/aquilon/worker/templates/machine.py b/lib/aquilon/worker/templates/machine.py
index 13761a813..34c2b4808 100755
--- a/lib/aquilon/worker/templates/machine.py
+++ b/lib/aquilon/worker/templates/machine.py
@@ -56,7 +56,7 @@ def get_rack_name(cls, dbmachine):
     @classmethod
     def template_name(cls, dbmachine):
         loc = dbmachine.location
-        return "%s/%s/%s/%s/%s" % (cls.prefix, loc.hub.fullname.lower(),
+        return "%s/%s/%s/%s/%s" % (cls.prefix, loc.continent.name,
                                    loc.building, cls.get_rack_name(dbmachine), dbmachine.label)
 
     def __init__(self, dbobj, **kwargs):