Fix data set name handling.