The Arduino number for the (7) pin is, and always has been, 4. The numbering of the pins down one side and up the other is for breadboarding purposes.
You could have attached an LED to D4 and one to pin (7), and tried turning pins 4 and 7 on in code, and observed which one actually lit up in less time than it took to do all this posting and arguing.
If you are using an Arduino board of any kind just use the pin numbers printed on the board and ignore which pins they relate to on the chip.
If you are designing a PCB to hold the processor chip or have it in a breadboard then you have to concern yourself with the chip pin numbers and how they relate to the Arduino pin numbers but not otherwise.