diff --git a/lib/Form/Search.php b/lib/Form/Search.php
index e7b4e3d9..a3e3c172 100644
--- a/lib/Form/Search.php
+++ b/lib/Form/Search.php
@@ -88,7 +88,7 @@ public function renderActive(
             $url->add(['actionID' => 'smart', 'list' => $this->_vars->get('smart_id'), 'tab_name' => $this->_vars->get('smart_id')]);
         }
         return parent::renderActive(
-            $this->getRenderer(['varrenderer_driver' => ['nag', 'nag']]),
+            $this->getRenderer(['varrenderer_driver' => ['nag', 'html']]),
             $this->_vars,
             $url->setRaw(true),
             'post',
diff --git a/lib/Form/Task.php b/lib/Form/Task.php
index 0712475d..f695ca87 100644
--- a/lib/Form/Task.php
+++ b/lib/Form/Task.php
@@ -215,7 +215,7 @@ public function renderActive(
         global $conf;
 
         return parent::renderActive(
-            $this->getRenderer(['varrenderer_driver' => ['nag', 'nag']]),
+            $this->getRenderer(['varrenderer_driver' => ['nag', 'html']]),
             $this->_vars,
             Horde::url(
                 $conf['urls']['pretty'] == 'rewrite'
diff --git a/lib/Ui/VarRenderer/Nag.php b/lib/Ui/VarRenderer/Html.php
similarity index 99%
rename from lib/Ui/VarRenderer/Nag.php
rename to lib/Ui/VarRenderer/Html.php
index d4fd6898..85d3f802 100644
--- a/lib/Ui/VarRenderer/Nag.php
+++ b/lib/Ui/VarRenderer/Html.php
@@ -11,14 +11,14 @@
  */
 
 /**
- * The Horde_Core_Ui_VarRenderer_Nag class provides additional methods for
+ * The Nag_Ui_VarRenderer_Html class provides additional methods for
  * rendering Nag specific fields.
  *
  * @todo    Clean this hack up with Horde_Form/H4
  * @author  Jan Schneider <jan@horde.org>
  * @package Nag
  */
-class Horde_Core_Ui_VarRenderer_Nag extends Horde_Core_Ui_VarRenderer_Html
+class Nag_Ui_VarRenderer_Html extends Horde_Core_Ui_VarRenderer_Html
 {
     protected function _renderVarInput_NagAlarm($form, $var, $vars)
     {