GCP-7955 - include the standard variable name in the error message