Rename Singleton to singleton