Refactor namespace for havana