More samples, renaming of files