Update final variable names to conform with the standard.