Thanks. I mainly went with that numbering as it's what's on the schematics, so it's easy to refer back to that.
I'll see if I can add the PMOD numbers, I've generally been rolling a new constraints file for each project though rather than using generic names.