fixed incomplete renaming