Changed Singleton class to use dispatch_once and changed confusing naming for that class