Page layout description file variables changed

Description

Before it used to be that Comment1 was called out as ${COMMENT0} and so on down the line.

Now, COMPANY is being called out as ${COMMENT0}, Comment1 as ${COMMENT1}, etc.

Is this right? I'm personally happy that the shift is gone and CommentX is ${COMMENTX} (please don't change this back) but it doesn't seem right for COMPANY to be ${COMMENT0} when it already has ${COMPANY}.

Steps to reproduce

1. Observe how sheet labels get mapped to a frame template.

KiCad Version

Application: KiCad

Version: (5.99.0-9257-g2a9d76f1e3), release build

Libraries:
	wxWidgets 3.0.5
	libcurl/7.71.0 OpenSSL/1.1.1g (Schannel) zlib/1.2.11 brotli/1.0.7 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.41.0

Platform: Windows 10 (build 19042), 64-bit edition, 64 bit, Little endian, wxMSW

Build Info:
	Date: Feb 20 2021 22:01:20
	wxWidgets: 3.0.5 (wchar_t,wx containers,compatible with 2.8)
	Boost: 1.73.0
	OCE: 6.9.1
	Curl: 7.71.0
	ngspice: 34
	Compiler: GCC 10.2.0 with C++ ABI 1014

Build settings:
	KICAD_SCRIPTING=ON
	KICAD_SCRIPTING_MODULES=ON
	KICAD_SCRIPTING_PYTHON3=OFF
	KICAD_SCRIPTING_WXPYTHON=ON
	KICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF
	KICAD_SCRIPTING_ACTION_MENU=ON
	KICAD_USE_OCE=ON
	KICAD_SPICE=ON