and some namespace fixes.
Just setting up the merge request so I can see CI results(?) before merging