More renaming and housekeeping.