Removed incorrect Model generation.  Added new model with correct naming, including field naming.