wip: namespace fixes