Reverted all variable name changes