Fix some MCC naming issues in Utilities.