fixed renaming problems