Renaming and cleanup

3 jobs for draw_sample2 in 1 minute and 28 seconds (queued for 3 seconds)