Fixed typos in app_name
Moved subclasses out