diff --git a/lib/Basic/Forward.php b/lib/Basic/Forward.php
index cbbf0c2..b87cc09 100644
--- a/lib/Basic/Forward.php
+++ b/lib/Basic/Forward.php
@@ -100,7 +100,7 @@ protected function _init()
         $form->renderActive(
             new Horde_Form_Renderer([
                 'encode_title' => false,
-                'varrenderer_driver' => ['ingo', 'ingo'],
+                'varrenderer_driver' => ['ingo', 'html'],
             ]),
             $this->vars,
             self::url(['append_session' => -1]),
diff --git a/lib/Basic/Spam.php b/lib/Basic/Spam.php
index 0112252..c44714e 100644
--- a/lib/Basic/Spam.php
+++ b/lib/Basic/Spam.php
@@ -45,7 +45,7 @@ protected function _init()
         $form = new Ingo_Form_Spam($this->vars);
         $renderer = new Horde_Form_Renderer([
             'encode_title' => false,
-            'varrenderer_driver' => ['ingo', 'ingo'],
+            'varrenderer_driver' => ['ingo', 'html'],
         ]);
 
         /* Perform requested actions. Ingo_Form_Spam does token checking for
diff --git a/lib/Basic/Vacation.php b/lib/Basic/Vacation.php
index eb3bc74..a39ed2f 100644
--- a/lib/Basic/Vacation.php
+++ b/lib/Basic/Vacation.php
@@ -128,7 +128,7 @@ protected function _init()
         $form->renderActive(
             new Horde_Form_Renderer([
                 'encode_title' => false,
-                'varrenderer_driver' => ['ingo', 'ingo'],
+                'varrenderer_driver' => ['ingo', 'html'],
             ]),
             $this->vars,
             self::url(['append_session' => -1]),
diff --git a/lib/Ui/VarRenderer/Ingo.php b/lib/Ui/VarRenderer/Html.php
similarity index 93%
rename from lib/Ui/VarRenderer/Ingo.php
rename to lib/Ui/VarRenderer/Html.php
index 166796e..ec3f39d 100644
--- a/lib/Ui/VarRenderer/Ingo.php
+++ b/lib/Ui/VarRenderer/Html.php
@@ -21,7 +21,7 @@
  * @license  http://www.horde.org/licenses/apache ASL
  * @package  Ingo
  */
-class Horde_Core_Ui_VarRenderer_Ingo extends Horde_Core_Ui_VarRenderer_Html
+class Ingo_Ui_VarRenderer_Html extends Horde_Core_Ui_VarRenderer_Html
 {
     public function __construct($params = [])
     {