Rename model to record

Cleanup