Updated naming of the samples