Minor variable name changes