Add first pass of explicit namespacing for datastreams - failing tests
finished adding namespace prefixes