updated entity names in data model