diff --git a/plone/formwidget/querystring/input.pt b/plone/formwidget/querystring/input.pt
index 41bbce5..592a593 100644
--- a/plone/formwidget/querystring/input.pt
+++ b/plone/formwidget/querystring/input.pt
@@ -1,4 +1,4 @@
-<div class="ArchetypesQueryWidget"
+<div class="QueryWidget"
      tal:define="fieldName view/name;
                  widget nocall:view;"
      tal:attributes="data-fieldname fieldName">
diff --git a/plone/formwidget/querystring/querywidget.css b/plone/formwidget/querystring/querywidget.css
index f187449..4563881 100644
--- a/plone/formwidget/querystring/querywidget.css
+++ b/plone/formwidget/querystring/querywidget.css
@@ -16,7 +16,7 @@
 .previewSearchResultsHeading {
     margin-top: 1em;
 }
-.ArchetypesQueryWidget .criteria {
+.QueryWidget .criteria {
     margin: 0 1em 0.5em 0;
     clear: both;
 }
@@ -27,7 +27,7 @@
     cursor: pointer;
     margin-left: 1em;
 }
-.error.ArchetypesQueryWidget {
+.error.QueryWidget {
     background-color:transparent;
     border:0;
     padding:0;
diff --git a/plone/formwidget/querystring/querywidget.js b/plone/formwidget/querystring/querywidget.js
index 2b528a3..6855800 100644
--- a/plone/formwidget/querystring/querywidget.js
+++ b/plone/formwidget/querystring/querywidget.js
@@ -172,7 +172,7 @@
     $.querywidget.updateSearch = function () {
         var query = portal_url + "/@@querybuilder_html_results?";
         var querylist  = [];
-        var items = $('.ArchetypesQueryWidget .queryindex');
+        var items = $('.QueryWidget .queryindex');
         if (!items.length) {
             return;
         }
@@ -209,7 +209,7 @@
         if ($('#sort_order:checked').length > 0) {
             query += '&sort_order=reverse';
         }
-        $.get(query, {}, function (data) { $('.ArchetypesQueryWidget .previewresults').html(data); });
+        $.get(query, {}, function (data) { $('.QueryWidget .previewresults').html(data); });
     };
 
     // Enhance for javascript browsers
@@ -252,7 +252,7 @@
             $.querywidget.config = data;
 
             // Find querywidgets
-            $(".ArchetypesQueryWidget").each(function () {
+            $(".QueryWidget").each(function () {
 
                 // Get object
                 var obj = $(this);
@@ -288,7 +288,7 @@
         });
 
         $('.queryindex').live('change', function () {
-            var fname = $(this).closest('.ArchetypesQueryWidget').attr('data-fieldname');
+            var fname = $(this).closest('.QueryWidget').attr('data-fieldname');
             var index = $(this).find(':selected')[0].value;
             $(this).parents(".criteria").children('.queryoperator')
                 .replaceWith($.querywidget.createQueryOperator(index, '', fname));
@@ -302,7 +302,7 @@
         });
 
         $('.queryoperator').live('change', function () {
-            var fname = $(this).closest('.ArchetypesQueryWidget').attr('data-fieldname');
+            var fname = $(this).closest('.QueryWidget').attr('data-fieldname');
             var index = $(this).parents('.criteria').children('.queryindex').val();
             var operatorvalue = $(this).children(':selected')[0].value;
             var widget = $.querywidget.config.indexes[index].operators[operatorvalue].widget;
@@ -340,7 +340,7 @@
         });
 
         $('.addIndex').live('change', function () {
-            var fname = $(this).closest('.ArchetypesQueryWidget').attr('data-fieldname');
+            var fname = $(this).closest('.QueryWidget').attr('data-fieldname');
             var index = $(this).find(':selected')[0].value;
             var criteria = $(this).parents('.criteria');
             var newcriteria = $(document.createElement('div'))