Changed the sample name logic to account for the IRRI naming scheme