Better filenames for the samples, please