Changed names in entities