Now conforming to datastream names as received