diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index c041901f9..d2da8c096 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -461,22 +461,22 @@ class CriterionConversionTest extends ItopDataTestCase
 			'TagSet Matches' => array(
 				'OQL' => "SELECT UserRequest WHERE tagfield MATCHES 'tag1'",
 				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE `UserRequest`.`tagfield` MATCHES 'tag1'",
-				'ExpectedCriterion' => array(array('widget' => 'tag_set')),
+				'ExpectedCriterion' => array(array('widget' => 'set')),
 			),
 			'TagSet Matches2' => array(
 				'OQL' => "SELECT UserRequest WHERE tagfield MATCHES 'tag1 tag2'",
 				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE `UserRequest`.`tagfield` MATCHES 'tag1 tag2'",
-				'ExpectedCriterion' => array(array('widget' => 'tag_set')),
+				'ExpectedCriterion' => array(array('widget' => 'set')),
 			),
 			'TagSet Undefined' => array(
 				'OQL' => "SELECT UserRequest WHERE tagfield = ''",
 				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE (`UserRequest`.`tagfield` = '')",
-				'ExpectedCriterion' => array(array('widget' => 'tag_set')),
+				'ExpectedCriterion' => array(array('widget' => 'set')),
 			),
 			'TagSet Undefined and tag' => array(
 				'OQL' => "SELECT UserRequest WHERE (((tagfield MATCHES 'tag1 tag2') OR (tagfield = '')) AND 1)",
 				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`tagfield` MATCHES 'tag1 tag2' OR (`UserRequest`.`tagfield` = '')) AND 1)",
-				'ExpectedCriterion' => array(array('widget' => 'tag_set')),
+				'ExpectedCriterion' => array(array('widget' => 'set')),
 			),
 
 		);