Entities fields renamed