Mesa: Rename patches so that they are actually applied

Sorry - please review and push when fine :-)