NameSampleDataStream renamed to NameSampleStream. More consistent with the other class names.