Add reformatting for O', St. and Mc names