Fix var names