Starting on enum namespace fix