Fix templates for first name of C source in primitives & minor++