diff --git a/factories/EventFactory.py b/factories/EventFactory.py
index d289049..1314015 100644
--- a/factories/EventFactory.py
+++ b/factories/EventFactory.py
@@ -31,33 +31,33 @@ class EventFactory:
 
     def createEndOfBallEvent(self):
         event = EndOfBallEvent(self.currentPlayer)
-        self.__registerEventToTarget(event, self.targets['OutholeTarget'])
+        self.__registerEventToTarget(event, self.targets['Outhole'])
         return event
 
     def createRightFlapEvent(self):
         event = RightFlapEvent()
-        self.__registerEventToTarget(event, self.targets['RightSlingshotTarget'])
+        self.__registerEventToTarget(event, self.targets['RightSlingshot'])
         return event
 
     def createLeftFlapEvent(self):
         event = LeftFlapEvent()
-        self.__registerEventToTarget(event, self.targets['LeftSlingshotTarget'])
+        self.__registerEventToTarget(event, self.targets['LeftSlingshot'])
         return event
 
     def createRightKickerEvent(self):
         event = RightKickerEvent()
-        self.__registerEventToTarget(event, self.targets['RightOutlaneKickerTarget'])
+        self.__registerEventToTarget(event, self.targets['RightOutlaneKicker'])
         return event
 
     def createEnterUpperPlayfieldEvent(self):
         event = EnterUpperPlayfieldEvent(self.currentPlayer, self.upperPlayfieldFlippers)
-        self.__registerEventToTarget(event, self.targets['UpperPlayfieldRollUnderTarget'])
+        self.__registerEventToTarget(event, self.targets['UpperPlayfieldRollUnder'])
         return event
 
     def createStartGameEvent(self):
         event = StartGameEvent(self.flipper)
         self.__registerEventToTarget(event, self.targets['Outhole'])
-        self.__registerEventToTarget(event, self.targets['CreditTarget'])
+        self.__registerEventToTarget(event, self.targets['Credit'])
         return event
 
     def __registerEventToTarget(self, event, target):