Only do as much renaming is strictly necessary in rename_apart

Closes #98