Fix use of uppercase variables in definitions