Updated tag names to make it obvious they are sample tags