renamed smach -> s_mach. fixed some rename issues