MC: Clean up method names in MCContext.