fixed renaming stuff