Use new convention for variable names.