Some renaming work.