minor variable name changes