performing renaming, as suggested on PR