Changed a bunch of method names, including Singleton<>