Adapt guidelines to use prefixed names in the dataset