-minor variable name changes