Finished renaming (I hope I haven't lost anything).