Merge "Rename some variables in definitions.mk" into main