More entity renames