diff --git a/application/controllers/HosttemplateController.php b/application/controllers/HosttemplateController.php
index 98841af9..28b1a29b 100644
--- a/application/controllers/HosttemplateController.php
+++ b/application/controllers/HosttemplateController.php
@@ -12,7 +12,7 @@ use ipl\Html\FormattedString;
 use ipl\Html\Html;
 use ipl\Html\Link;
 use ipl\Web\CompatController;
-use ipl\Web\Component\UnorderedList;
+use ipl\Web\Widget\UnorderedList;
 
 class HosttemplateController extends CompatController
 {
diff --git a/application/controllers/NotificationtemplateController.php b/application/controllers/NotificationtemplateController.php
index 83082d8c..d2f2af0e 100644
--- a/application/controllers/NotificationtemplateController.php
+++ b/application/controllers/NotificationtemplateController.php
@@ -12,7 +12,7 @@ use ipl\Html\FormattedString;
 use ipl\Html\Html;
 use ipl\Html\Link;
 use ipl\Web\CompatController;
-use ipl\Web\Component\UnorderedList;
+use ipl\Web\Widget\UnorderedList;
 
 class NotificationtemplateController extends CompatController
 {
diff --git a/application/controllers/ServicetemplateController.php b/application/controllers/ServicetemplateController.php
index 915c6ef0..ceb12234 100644
--- a/application/controllers/ServicetemplateController.php
+++ b/application/controllers/ServicetemplateController.php
@@ -13,7 +13,7 @@ use ipl\Html\FormattedString;
 use ipl\Html\Html;
 use ipl\Html\Link;
 use ipl\Web\CompatController;
-use ipl\Web\Component\UnorderedList;
+use ipl\Web\Widget\UnorderedList;
 
 class ServicetemplateController extends CompatController
 {
diff --git a/library/Director/Dashboard/Dashboard.php b/library/Director/Dashboard/Dashboard.php
index c19f6dd8..12564260 100644
--- a/library/Director/Dashboard/Dashboard.php
+++ b/library/Director/Dashboard/Dashboard.php
@@ -14,7 +14,7 @@ use ipl\Html\Html;
 use ipl\Html\HtmlString;
 use ipl\Html\Util;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\Tabs;
+use ipl\Web\Widget\Tabs;
 use Zend_Db_Select as ZfSelect;
 
 abstract class Dashboard extends Html implements Countable
diff --git a/library/Director/Web/ActionBar/DirectorBaseActionBar.php b/library/Director/Web/ActionBar/DirectorBaseActionBar.php
index 3830b966..f68663e0 100644
--- a/library/Director/Web/ActionBar/DirectorBaseActionBar.php
+++ b/library/Director/Web/ActionBar/DirectorBaseActionBar.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Web\ActionBar;
 
 use ipl\Html\Link;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\ActionBar;
+use ipl\Web\Widget\ActionBar;
 use ipl\Web\Url;
 
 class DirectorBaseActionBar extends ActionBar
diff --git a/library/Director/Web/Controller/ActionController.php b/library/Director/Web/Controller/ActionController.php
index 03d1db82..235966a9 100644
--- a/library/Director/Web/Controller/ActionController.php
+++ b/library/Director/Web/Controller/ActionController.php
@@ -19,7 +19,7 @@ use Icinga\Security\SecurityException;
 use Icinga\Web\Controller;
 use Icinga\Web\UrlParams;
 use Icinga\Web\Widget;
-use ipl\Web\Component\ControlsAndContent;
+use ipl\Web\Widget\ControlsAndContent;
 use ipl\Web\Controller\Extension\ControlsAndContentHelper;
 use ipl\Zf1\SimpleViewRenderer;
 
diff --git a/library/Director/Web/Table/ChoicesTable.php b/library/Director/Web/Table/ChoicesTable.php
index c0d75d8e..1848d17a 100644
--- a/library/Director/Web/Table/ChoicesTable.php
+++ b/library/Director/Web/Table/ChoicesTable.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Db;
 use ipl\Html\Link;
-use ipl\Web\Component\ControlsAndContent;
+use ipl\Web\Widget\ControlsAndContent;
 use ipl\Web\Table\ZfQueryBasedTable;
 use ipl\Web\Url;
 
diff --git a/library/Director/Web/Table/GroupMemberTable.php b/library/Director/Web/Table/GroupMemberTable.php
index 62c9810f..1df6aec0 100644
--- a/library/Director/Web/Table/GroupMemberTable.php
+++ b/library/Director/Web/Table/GroupMemberTable.php
@@ -5,7 +5,7 @@ namespace Icinga\Module\Director\Web\Table;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Objects\IcingaObjectGroup;
 use ipl\Html\Link;
-use ipl\Web\Component\ControlsAndContent;
+use ipl\Web\Widget\ControlsAndContent;
 use ipl\Web\Table\ZfQueryBasedTable;
 use ipl\Web\Url;
 
diff --git a/library/Director/Web/Tabs/DataTabs.php b/library/Director/Web/Tabs/DataTabs.php
index 385aee63..f2d77a19 100644
--- a/library/Director/Web/Tabs/DataTabs.php
+++ b/library/Director/Web/Tabs/DataTabs.php
@@ -3,7 +3,7 @@
 namespace Icinga\Module\Director\Web\Tabs;
 
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\Tabs;
+use ipl\Web\Widget\Tabs;
 
 class DataTabs extends Tabs
 {
diff --git a/library/Director/Web/Tabs/ObjectTabs.php b/library/Director/Web/Tabs/ObjectTabs.php
index cd25e667..d70cdb6a 100644
--- a/library/Director/Web/Tabs/ObjectTabs.php
+++ b/library/Director/Web/Tabs/ObjectTabs.php
@@ -5,7 +5,7 @@ namespace Icinga\Module\Director\Web\Tabs;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Objects\IcingaObject;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\Tabs;
+use ipl\Web\Widget\Tabs;
 
 class ObjectTabs extends Tabs
 {
diff --git a/library/Director/Web/Tabs/ObjectsTabs.php b/library/Director/Web/Tabs/ObjectsTabs.php
index 0d9666d6..043fa659 100644
--- a/library/Director/Web/Tabs/ObjectsTabs.php
+++ b/library/Director/Web/Tabs/ObjectsTabs.php
@@ -5,7 +5,7 @@ namespace Icinga\Module\Director\Web\Tabs;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Objects\IcingaObject;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\Tabs;
+use ipl\Web\Widget\Tabs;
 
 class ObjectsTabs extends Tabs
 {
diff --git a/library/Director/Web/Tree/TemplateTreeRenderer.php b/library/Director/Web/Tree/TemplateTreeRenderer.php
index 0dd811cf..fcb54a11 100644
--- a/library/Director/Web/Tree/TemplateTreeRenderer.php
+++ b/library/Director/Web/Tree/TemplateTreeRenderer.php
@@ -8,7 +8,7 @@ use ipl\Html\BaseElement;
 use ipl\Html\Html;
 use ipl\Html\Link;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\ControlsAndContent;
+use ipl\Web\Widget\ControlsAndContent;
 
 class TemplateTreeRenderer extends BaseElement
 {
diff --git a/library/vendor/ipl/Web/CompatController.php b/library/vendor/ipl/Web/CompatController.php
index d51af096..c6a88a01 100644
--- a/library/vendor/ipl/Web/CompatController.php
+++ b/library/vendor/ipl/Web/CompatController.php
@@ -20,7 +20,7 @@ use Icinga\Web\Url as WebUrl;
 use Icinga\Web\Window;
 use ipl\Compat\Translator;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\ControlsAndContent;
+use ipl\Web\Widget\ControlsAndContent;
 use ipl\Web\Controller\Extension\ControlsAndContentHelper;
 use ipl\Zf1\SimpleViewRenderer;
 use Zend_Controller_Action;
diff --git a/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php b/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php
index 291891ae..dc1687e2 100644
--- a/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php
+++ b/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php
@@ -3,9 +3,9 @@
 namespace ipl\Web\Controller\Extension;
 
 use ipl\Html\Html;
-use ipl\Web\Component\Content;
-use ipl\Web\Component\Controls;
-use ipl\Web\Component\Tabs;
+use ipl\Web\Widget\Content;
+use ipl\Web\Widget\Controls;
+use ipl\Web\Widget\Tabs;
 use ipl\Web\Url;
 
 trait ControlsAndContentHelper
diff --git a/library/vendor/ipl/Web/Table/ZfQueryBasedTable.php b/library/vendor/ipl/Web/Table/ZfQueryBasedTable.php
index e4ecd831..46d54b4a 100644
--- a/library/vendor/ipl/Web/Table/ZfQueryBasedTable.php
+++ b/library/vendor/ipl/Web/Table/ZfQueryBasedTable.php
@@ -12,10 +12,11 @@ use ipl\Html\Html;
 use ipl\Html\Link;
 use ipl\Html\Table;
 use ipl\Translation\TranslationHelper;
-use ipl\Web\Component\ControlsAndContent;
-use ipl\Web\Component\Paginator;
+use ipl\Web\Widget\ControlsAndContent;
+use ipl\Web\Widget\Paginator;
 use ipl\Web\Table\Extension\QuickSearch;
 use ipl\Web\Url;
+use Zend_Db_Exception as Expr;
 
 abstract class ZfQueryBasedTable extends Table
 {
diff --git a/library/vendor/ipl/Web/Component/AbstractList.php b/library/vendor/ipl/Web/Widget/AbstractList.php
similarity index 96%
rename from library/vendor/ipl/Web/Component/AbstractList.php
rename to library/vendor/ipl/Web/Widget/AbstractList.php
index 9468a076..cf6f794d 100644
--- a/library/vendor/ipl/Web/Component/AbstractList.php
+++ b/library/vendor/ipl/Web/Widget/AbstractList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use ipl\Html\Attributes;
 use ipl\Html\BaseElement;
diff --git a/library/vendor/ipl/Web/Component/ActionBar.php b/library/vendor/ipl/Web/Widget/ActionBar.php
similarity index 93%
rename from library/vendor/ipl/Web/Component/ActionBar.php
rename to library/vendor/ipl/Web/Widget/ActionBar.php
index edb5db06..2105d2a6 100644
--- a/library/vendor/ipl/Web/Component/ActionBar.php
+++ b/library/vendor/ipl/Web/Widget/ActionBar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use ipl\Html\BaseElement;
 
diff --git a/library/vendor/ipl/Web/Component/Content.php b/library/vendor/ipl/Web/Widget/Content.php
similarity index 85%
rename from library/vendor/ipl/Web/Component/Content.php
rename to library/vendor/ipl/Web/Widget/Content.php
index aa150643..9fb1d2d3 100644
--- a/library/vendor/ipl/Web/Component/Content.php
+++ b/library/vendor/ipl/Web/Widget/Content.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use ipl\Html\Container;
 
diff --git a/library/vendor/ipl/Web/Component/Controls.php b/library/vendor/ipl/Web/Widget/Controls.php
similarity index 98%
rename from library/vendor/ipl/Web/Component/Controls.php
rename to library/vendor/ipl/Web/Widget/Controls.php
index d7316336..dde3a4d2 100644
--- a/library/vendor/ipl/Web/Component/Controls.php
+++ b/library/vendor/ipl/Web/Widget/Controls.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use ipl\Html\Container;
 use ipl\Html\Html;
diff --git a/library/vendor/ipl/Web/Component/ControlsAndContent.php b/library/vendor/ipl/Web/Widget/ControlsAndContent.php
similarity index 96%
rename from library/vendor/ipl/Web/Component/ControlsAndContent.php
rename to library/vendor/ipl/Web/Widget/ControlsAndContent.php
index 784a7c21..d3a27638 100644
--- a/library/vendor/ipl/Web/Component/ControlsAndContent.php
+++ b/library/vendor/ipl/Web/Widget/ControlsAndContent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use ipl\Html\Html;
 use ipl\Web\Url;
diff --git a/library/vendor/ipl/Web/Component/ListItem.php b/library/vendor/ipl/Web/Widget/ListItem.php
similarity index 94%
rename from library/vendor/ipl/Web/Component/ListItem.php
rename to library/vendor/ipl/Web/Widget/ListItem.php
index 20f11f7a..52299a7a 100644
--- a/library/vendor/ipl/Web/Component/ListItem.php
+++ b/library/vendor/ipl/Web/Widget/ListItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use ipl\Html\Attributes;
 use ipl\Html\BaseElement;
diff --git a/library/vendor/ipl/Web/Component/OrderedList.php b/library/vendor/ipl/Web/Widget/OrderedList.php
similarity index 72%
rename from library/vendor/ipl/Web/Component/OrderedList.php
rename to library/vendor/ipl/Web/Widget/OrderedList.php
index 5a3ea1dc..40f69910 100644
--- a/library/vendor/ipl/Web/Component/OrderedList.php
+++ b/library/vendor/ipl/Web/Widget/OrderedList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 class OrderedList extends AbstractList
 {
diff --git a/library/vendor/ipl/Web/Component/Paginator.php b/library/vendor/ipl/Web/Widget/Paginator.php
similarity index 99%
rename from library/vendor/ipl/Web/Component/Paginator.php
rename to library/vendor/ipl/Web/Widget/Paginator.php
index d7dcda67..e6bd0c4e 100644
--- a/library/vendor/ipl/Web/Component/Paginator.php
+++ b/library/vendor/ipl/Web/Widget/Paginator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use Icinga\Exception\ProgrammingError;
 use ipl\Data\Paginatable;
diff --git a/library/vendor/ipl/Web/Component/Tabs.php b/library/vendor/ipl/Web/Widget/Tabs.php
similarity index 81%
rename from library/vendor/ipl/Web/Component/Tabs.php
rename to library/vendor/ipl/Web/Widget/Tabs.php
index c5f74385..45fd11cd 100644
--- a/library/vendor/ipl/Web/Component/Tabs.php
+++ b/library/vendor/ipl/Web/Widget/Tabs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 use Icinga\Web\Widget\Tabs as WebTabs;
 use ipl\Html\ValidHtml;
diff --git a/library/vendor/ipl/Web/Component/UnorderedList.php b/library/vendor/ipl/Web/Widget/UnorderedList.php
similarity index 73%
rename from library/vendor/ipl/Web/Component/UnorderedList.php
rename to library/vendor/ipl/Web/Widget/UnorderedList.php
index acfaae64..8bfcf9f3 100644
--- a/library/vendor/ipl/Web/Component/UnorderedList.php
+++ b/library/vendor/ipl/Web/Widget/UnorderedList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ipl\Web\Component;
+namespace ipl\Web\Widget;
 
 class UnorderedList extends AbstractList
 {