Refactored the Singleton name.