Made variable name changes