Fix var names in base