Revert: Refactor namespace for havana