More renaming and reversioning