Codegen: rename routine to make_routine
Codegen: routine rename test fixes