fix base class name and createInstance