LPS-51175 SF: Remove unnessesary namespacing