Change naming convention.
Change Singleton to use enumeration.