Squashed over half the errors with the mass renaming script. TODO fix the other 450.