fixed up the data model so that it maps properly to the generated JSON schema & so that the class and field names UI works #383