fixed renaming in imports