Renames and restructuring.