Fix naming for havana