Some renaming, polishing.