Minor change in DataNameAndRandomString & DataNameAndCost typed