Fix namespacing issdue

[Story #49167601]