Renamed to SingletonFactory
Renamed SingletonRegistry
Changed SingletonFactory references