Renaming some parts