new datamodel

change names ... in temp data model