update data model and entity names