Minor changes to fix variable naming inconsistencies