MAINT: small changes to variable names and default settings