Refs cleanup
Model renaming + JSON.NET update