Updated data set names to use underscores