just a quick grep -r and regex substitution, but didn't see anything wrong in the diffs during a quick proofread