Rename some prisons

This does two things:

1) renames some prisons
2) ensures that those renames are safe, ie. when an old request with that prison name comes in, we'll handle it without error.