More renaming issues