Fix #58 - renaming models to entities for coherence