More mul renaming cleanup