one last renaming pass