fixed renaming issues