Renamed files and folders as appropriate.