Added variable name changes