[TASK] Add namespacing where missing