changed names on Singleton