More renaming and cleaning