Fix sample names not being used in output