Fix var naming