Some renaming and housekeeping.