Rename entities according to discussion