Rename NewDataSet to DataSet

It was named this during the refactor. It is no longer the 'new' data
set class, it is 'the' data set class.