continuation of bug fix, this time on renaming