diff --git a/factories/TargetFactory.py b/factories/TargetFactory.py
index 07ba589..85a06aa 100644
--- a/factories/TargetFactory.py
+++ b/factories/TargetFactory.py
@@ -12,21 +12,21 @@ class TargetFactory:
 
             target = glo[key]
             if 'Target' in key and 'Bank' not in key and key not in ['Target', 'BankTarget']:
-                result[key] = target()
+                targetObject = target()
+                result[targetObject.name] = targetObject
             elif 'Bank' in key and 'Target' not in key and key not in ['Bank', 'BankTarget']:
-                targets = TargetFactory.createBankTarget(target, key)
+                targets = TargetFactory.createBankTarget(target)
                 result.update(targets)
         # todo check with driver?
         return result
 
     @staticmethod
-    def createBankTarget(target, key):
+    def createBankTarget(target):
         bankTarget = target()
         targets = dict()
-        targets[key] = bankTarget
+        targets[bankTarget.name] = bankTarget
 
         for target in bankTarget.targets:
-            name = type(target).__name__
-            targets[name] = target
+            targets[target.name] = target
 
         return targets