MAINT: change variable names that used incorrect terminology