Fixed bug with double-barreled Mc*/O'* names, simplified regex