LPS-43687 Improve consistenty adding namespaces