Update references to mach