Fix bad merge that reverted namespace change