Minor changes to fix variable names.