Definitely Penne.
These are Maccheroni (rigati):
However, I think a lot of people doesn't know how to identify all the various kind of pasta. And since Mac & Cheese has basically nothing to do with Italian food/recipes, I don't think the wrong kind of pasta is a big deal after all