Rename datamodel to persistedmodel

/to @ritch please review