Minor touch-ups and additions to renaming script