Change naming convention of numerical locations for clarity