Rename DataModel to PersistedModel