chore(namespaces): more fixes for code inside namespaces