Renamed SingletonRegistry
Changed SingletonFactory references