Fix dataset header and name