Renamed to SingletonFactory
Renamed to SingletonFactory