diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 619c7dd5d0..e96b9637cc 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -34,7 +34,7 @@ public function init()
      *
      * @param   array   $resources      The resources to choose from
      *
-     * @return  self
+     * @return  $this
      */
     public function setResources(array $resources)
     {
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 838be77767..562526788a 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -35,7 +35,7 @@ public function init()
      *
      * @param   array   $resources      The resources to choose from
      *
-     * @return  self
+     * @return  $this
      */
     public function setResources(array $resources)
     {
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 276d73b942..86322902b6 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -38,7 +38,7 @@ public function init()
      *
      * @param   Config      $resources      The resource configuration
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(Config $resourceConfig)
     {
@@ -82,7 +82,7 @@ public function getBackendForm($type)
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the backend does already exist
      */
@@ -159,7 +159,7 @@ public function remove($name)
      * @param   string      $name           The name of the backend to be moved
      * @param   int         $position       The new (absolute) position of the backend
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the backend does not exist
      */
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index ce99d1e4c6..5d1eeaa9b5 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -53,7 +53,7 @@ public function getResourceForm($type)
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @thrwos  InvalidArgumentException    In case the resource does already exist
      */
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index e3602966aa..58d550793b 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -25,7 +25,7 @@ class ConfigForm extends Form
      *
      * @param   Config      $config     The configuration to use
      *
-     * @return  self
+     * @return  $this
      */
     public function setIniConfig(Config $config)
     {
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 09aa6b6522..d098cb7814 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -48,7 +48,7 @@ public function init()
      *
      * @param   Preferences     $preferences    The preferences to work with
      *
-     * @return  self
+     * @return  $this
      */
     public function setPreferences(Preferences $preferences)
     {
@@ -61,17 +61,18 @@ public function setPreferences(Preferences $preferences)
      *
      * @param   PreferencesStore    $store      The preference store to use
      *
-     * @return  self
+     * @return  $this
      */
     public function setStore(PreferencesStore $store)
     {
         $this->store = $store;
+        return $this;
     }
 
     /**
      * Persist preferences
      *
-     * @return  self
+     * @return  $this
      */
     public function save()
     {
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index 3fd323340a..6df8c32bb3 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -37,7 +37,7 @@ public function __construct(Zend_Controller_Request_Abstract $request = null)
     /**
      * Helper entry point
      *
-     * @return  self
+     * @return  $this
      */
     public function dateFormat()
     {
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 230a83e055..8a1746b694 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -77,7 +77,7 @@ public function getConfigFile()
      *
      * @param   string      $filepath   The path to the ini file
      *
-     * @return  self
+     * @return  $this
      */
     public function setConfigFile($filepath)
     {
@@ -223,7 +223,7 @@ public function getSection($name)
      * @param   string              $name
      * @param   array|ConfigObject  $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setSection($name, $config = null)
     {
@@ -242,7 +242,7 @@ public function setSection($name, $config = null)
      *
      * @param   string  $name
      *
-     * @return  self
+     * @return  $this
      */
     public function removeSection($name)
     {
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index 446b77b57a..0408d182e2 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -20,7 +20,7 @@ class EmbeddedWeb extends ApplicationBootstrap
      * Embedded bootstrap parts
      *
      * @see    ApplicationBootstrap::bootstrap
-     * @return self
+     * @return $this
      */
     protected function bootstrap()
     {
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 3d50df109f..8f48d7b77b 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -156,7 +156,7 @@ private function detectEnabledModules()
     /**
      * Try to set all enabled modules in loaded sate
      *
-     * @return  self
+     * @return  $this
      * @see     Manager::loadModule()
      */
     public function loadEnabledModules()
@@ -173,7 +173,7 @@ public function loadEnabledModules()
      * @param string $name    The name of the module to load
      * @param mixed  $basedir Optional module base directory
      *
-     * @return self
+     * @return $this
      */
     public function loadModule($name, $basedir = null)
     {
@@ -197,7 +197,7 @@ public function loadModule($name, $basedir = null)
      *
      * @param   string $name                The module to enable
      *
-     * @return  self
+     * @return  $this
      * @throws  ConfigurationError          When trying to enable a module that is not installed
      * @throws  NotFoundError               In case the "enabledModules" directory does not exist
      * @throws  SystemPermissionException   When insufficient permissions for the application exist
@@ -256,7 +256,7 @@ public function enableModule($name)
      *
      * @param   string $name                The name of the module to disable
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ConfigurationError          When the module is not installed or it's not a symlink
      * @throws  SystemPermissionException   When the module can't be disabled
@@ -491,7 +491,7 @@ public function listInstalledModules()
      *
      * @param   array   $availableDirs      Installed modules location
      *
-     * @return self
+     * @return $this
      */
     public function detectInstalledModules(array $availableDirs = null)
     {
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index c0036e1faf..c1fd845138 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -752,7 +752,7 @@ protected function provideRestriction($name, $description)
      * @param string $name   Unique tab name
      * @param string $config Tab config
      *
-     * @return self
+     * @return $this
      */
     protected function provideConfigTab($name, $config = array())
     {
@@ -769,7 +769,7 @@ protected function provideConfigTab($name, $config = array())
      *
      * @param   string  $className      The name of the class
      *
-     * @return  self
+     * @return  $this
      */
     protected function provideSetupWizard($className)
     {
@@ -780,7 +780,7 @@ protected function provideSetupWizard($className)
     /**
      * Register new namespaces on the autoloader
      *
-     * @return self
+     * @return $this
      */
     protected function registerAutoloader()
     {
@@ -802,7 +802,7 @@ protected function registerAutoloader()
     /**
      * Bind text domain for i18n
      *
-     * @return self
+     * @return $this
      */
     protected function registerLocales()
     {
@@ -849,7 +849,7 @@ public function listLocales()
      *
      * Add controller directory to mvc
      *
-     * @return self
+     * @return $this
      */
     protected function registerWebIntegration()
     {
@@ -872,7 +872,7 @@ protected function registerWebIntegration()
     /**
      * Add routes for static content and any route added via addRoute() to the route chain
      *
-     * @return  self
+     * @return  $this
      * @see     addRoute()
      */
     protected function registerRoutes()
@@ -912,7 +912,7 @@ protected function registerRoutes()
     /**
      * Run module bootstrap script
      *
-     * @return self
+     * @return $this
      */
     protected function launchRunScript()
     {
@@ -924,7 +924,7 @@ protected function launchRunScript()
      *
      * @param string $file File to include
      *
-     * @return self
+     * @return $this
      */
     protected function includeScript($file)
     {
@@ -958,7 +958,7 @@ protected function launchConfigScript()
      * @param string $class
      * @param string $key
      *
-     * @return self
+     * @return $this
      */
     protected function registerHook($name, $class, $key = null)
     {
@@ -977,7 +977,7 @@ protected function registerHook($name, $class, $key = null)
      * @param   string                                  $name   Name of the route
      * @param   Zend_Controller_Router_Route_Abstract   $route  Instance of the route
      *
-     * @return  self
+     * @return  $this
      * @see     registerRoutes()
      */
     protected function addRoute($name, Zend_Controller_Router_Route_Abstract $route)
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index e5a090bb5c..8e35660dfa 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -26,7 +26,7 @@ abstract class UserBackend implements Countable
      *
      * @param   string $name
      *
-     * @return  self
+     * @return  $this
      */
     public function setName($name)
     {
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index a7f8d6d5f4..2715f3b2db 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -115,7 +115,7 @@ public function addDataset(array $dataset)
      *
      * @param   AxisUnit $unit      The AxisUnit implementation to use for the x axis
      *
-     * @return  self                This Axis Object
+     * @return  $this                This Axis Object
      * @see     Axis::CalendarUnit
      * @see     Axis::LinearUnit
      */
@@ -130,7 +130,7 @@ public function setUnitForXAxis(AxisUnit $unit)
      *
      * @param   AxisUnit $unit      The AxisUnit implementation to use for the y axis
      *
-     * @return  self                This Axis Object
+     * @return  $this                This Axis Object
      * @see     Axis::CalendarUnit
      * @see     Axis::LinearUnit
      */
@@ -331,7 +331,7 @@ public function setXLabel($label)
      *
      * @param   string $label   The label to use for the y axis
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setYLabel($label)
     {
@@ -346,7 +346,7 @@ public function setYLabel($label)
     *
     * @param    int $xMin   The minimum value to use for the x axis
     *
-    * @return   self        Fluid interface
+    * @return   $this        Fluid interface
     */
     public function setXMin($xMin)
     {
@@ -361,7 +361,7 @@ public function setXMin($xMin)
      *
      * @param   int $yMin   The minimum value to use for the x axis
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setYMin($yMin)
     {
@@ -376,7 +376,7 @@ public function setYMin($yMin)
      *
      * @param   int $xMax   The minimum value to use for the x axis
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setXMax($xMax)
     {
@@ -391,7 +391,7 @@ public function setXMax($xMax)
      *
      * @param   int $yMax   The minimum value to use for the y axis
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setYMax($yMax)
     {
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index 9f867ac660..57ca9f4696 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -132,7 +132,7 @@ private function configureAxisFromDatasets()
      *
      * @param   array $axis,... The line definitions to draw
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function drawLines(array $axis)
     {
@@ -146,7 +146,7 @@ public function drawLines(array $axis)
      * Refer to the graphs.md for a detailed list of allowed attributes
      *
      * @param   array $axis
-     * @return  self
+     * @return  $this
      */
     public function drawBars(array $axis)
     {
@@ -215,7 +215,7 @@ private function initTooltips($data)
      * @param   string $yAxisLabel  The label to use for the y axis
      * @param   string $axisName    The name of the axis, for now 'default'
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setAxisLabel($xAxisLabel, $yAxisLabel, $axisName = 'default')
     {
@@ -229,7 +229,7 @@ public function setAxisLabel($xAxisLabel, $yAxisLabel, $axisName = 'default')
      * @param   AxisUnit    $unit       The unit for the x axis
      * @param   string      $axisName   The name of the axis to set the label for, currently only 'default'
      *
-     * @return  self                    Fluid interface
+     * @return  $this                    Fluid interface
      */
     public function setXAxis(AxisUnit $unit, $axisName = 'default')
     {
@@ -243,7 +243,7 @@ public function setXAxis(AxisUnit $unit, $axisName = 'default')
      * @param   AxisUnit    $unit       The unit for the y axis
      * @param   string      $axisName   The name of the axis to set the label for, currently only 'default'
      *
-     * @return  self                    Fluid interface
+     * @return  $this                    Fluid interface
      */
     public function setYAxis(AxisUnit $unit, $axisName = 'default')
     {
@@ -276,7 +276,7 @@ protected function init()
      * @param   Axis    $axis The new axis to use
      * @param   string  $name The name of the axis, currently only 'default'
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function setAxis(Axis $axis, $name = 'default')
     {
@@ -290,7 +290,7 @@ public function setAxis(Axis $axis, $name = 'default')
      * @param   Axis    $axis The axis object to add
      * @param   string  $name The name of the axis
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function addAxis(Axis $axis, $name)
     {
@@ -307,7 +307,7 @@ public function addAxis(Axis $axis, $name)
      * @param   int     $yMin       The minimum value for the y axis or null to use a dynamic value
      * @param   string  $axisName   The name of the axis to set the minimum, currently only 'default'
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setAxisMin($xMin = null, $yMin = null, $axisName = 'default')
     {
@@ -324,7 +324,7 @@ public function setAxisMin($xMin = null, $yMin = null, $axisName = 'default')
      * @param   int     $yMax       The maximum value for the y axis or null to use a dynamic value
      * @param   string  $axisName   The name of the axis to set the maximum, currently only 'default'
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setAxisMax($xMax = null, $yMax = null, $axisName = 'default')
     {
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index 6b19969c84..b7fdb47557 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -107,7 +107,7 @@ private function normalizeDataSet(&$pie)
      *
      * @param   array $dataSet,...  The pie definition, see graphs.md for further details concerning the format
      *
-     * @return  self                Fluent interface
+     * @return  $this                Fluent interface
      */
     public function drawPie(array $dataSet)
     {
@@ -272,7 +272,7 @@ private function renderStackedPie(Canvas $innerBox, DOMElement $labelBox)
      *
      * @param string $type  Either self::STACKED or self::ROW
      *
-     * @return self         Fluent interface
+     * @return $this         Fluent interface
      */
     public function setType($type)
     {
@@ -283,7 +283,7 @@ public function setType($type)
     /**
      * Hide the caption from this PieChart
      *
-     * @return self         Fluent interface
+     * @return $this         Fluent interface
      */
     public function disableLegend()
     {
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index 86c2c729d0..c8917622ac 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -77,7 +77,7 @@ public function __construct(array $points)
      *
      * @param   array $points Either a single [x, y] point or an array of x, y points
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function append(array $points)
     {
@@ -96,7 +96,7 @@ public function append(array $points)
      *
      * @param   array $points Either a single [x, y] point or an array of x, y points
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function prepend(array $points)
     {
@@ -115,7 +115,7 @@ public function prepend(array $points)
      *
      * @param   boolean $bool True to draw discrete or false to draw straight lines between points
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function setDiscrete($bool)
     {
@@ -126,7 +126,7 @@ public function setDiscrete($bool)
     /**
      * Mark this path as containing absolute coordinates
      *
-     * @return self Fluid interface
+     * @return $this Fluid interface
      */
     public function toAbsolute()
     {
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index c4bece29c8..839c9bc9c2 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -189,7 +189,7 @@ private function drawDescriptionLabel(RenderContext $ctx, $r)
      *
      * @param   int $x The new x position
      *
-     * @return  self   Fluid interface
+     * @return  $this   Fluid interface
      */
     public function setX($x)
     {
@@ -202,7 +202,7 @@ public function setX($x)
      *
      * @param   int $y  The new y position
      *
-     * @return  self    Fluid interface
+     * @return  $this    Fluid interface
      */
     public function setY($y)
     {
@@ -215,7 +215,7 @@ public function setY($y)
      *
      * @param   DOMElement $group   The label group
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setLabelGroup(DOMElement $group)
     {
@@ -228,7 +228,7 @@ public function setLabelGroup(DOMElement $group)
      *
      * @param   string $caption The caption for this element
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setCaption($caption)
     {
@@ -241,7 +241,7 @@ public function setCaption($caption)
      *
      * @param   int $offset     The offset for the caption handle
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setCaptionOffset($offset)
     {
@@ -254,7 +254,7 @@ public function setCaptionOffset($offset)
      *
      * @param   int $bound  The offset for the caption text
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setOuterCaptionBound($bound)
     {
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index e36d607078..b8ff795260 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -59,7 +59,7 @@ class Styleable
      *
      * @param   string $width   The stroke with with unit
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setStrokeWidth($width)
     {
@@ -72,7 +72,7 @@ public function setStrokeWidth($width)
      *
      * @param   string $color   The color to set for the stroke
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setStrokeColor($color)
     {
@@ -85,7 +85,7 @@ public function setStrokeColor($color)
      *
      * @param   string $styles  The styles to set additionally
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setAdditionalStyle($styles)
     {
@@ -98,7 +98,7 @@ public function setAdditionalStyle($styles)
      *
      * @param   string $color   The color to use for filling or null to use no fill
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setFill($color = null)
     {
@@ -111,7 +111,7 @@ public function setFill($color = null)
      *
      * @param   string $id  The id to set for this element
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setId($id)
     {
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index 3125d1d128..62a11eef7e 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -104,7 +104,7 @@ public function __construct($x, $y, $text, $fontSize = '1.5em')
      *
      * @param   string $size    The font size including a unit
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setFontSize($size)
     {
@@ -117,7 +117,7 @@ public function setFontSize($size)
      *
      * @param   String $align   Value how to align
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setAlignment($align)
     {
@@ -130,7 +130,7 @@ public function setAlignment($align)
      *
      * @param string $weight    The weight of the string
      *
-     * @return self             Fluid interface
+     * @return $this             Fluid interface
      */
     public function setFontWeight($weight)
     {
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index da732c025b..5f4c6979cf 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -110,7 +110,7 @@ private function calculateLabels($unit)
      * @param   array   $dataset    The dataset to update
      * @param   int     $idx        The index to use for determining the data
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index ab16b29418..bf27ed8a35 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -74,7 +74,7 @@ public function __construct($nrOfTicks = 10)
      * @param   array $dataset  The dataset to add
      * @param   int $idx        The idx (0 for x, 1 for y)
      *
-     * @return  self            Fluent interface
+     * @return  $this            Fluent interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 8f90a9f036..0e87e0433f 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -65,7 +65,7 @@ public function __construct($base = 10)
      * @param   array $dataset  The dataset to add
      * @param   int $idx        The idx (0 for x, 1 for y)
      *
-     * @return  self            Fluent interface
+     * @return  $this            Fluent interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index 2ea1db136c..bc75516efe 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -15,7 +15,7 @@ class StaticAxis implements AxisUnit
      * @param array $dataset    The dataset that will be shown in the Axis
      * @param int   $idx        The idx in the dataset (0 for x, 1 for y)
      *
-     * @return self             Fluent interface
+     * @return $this             Fluent interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 34dd5e177f..507c50e3b3 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -186,7 +186,7 @@ public function req($name, $strict = true)
      * @param   string  $key    The option name
      * @param   mixed   $value  The value to set
      *
-     * @return  self
+     * @return  $this
      */
     public function set($key, $value)
     {
@@ -199,7 +199,7 @@ public function set($key, $value)
      *
      * @param   string|array    $keys   The option or options to remove
      *
-     * @return  self
+     * @return  $this
      */
     public function remove($keys = array())
     {
@@ -263,7 +263,7 @@ public function shift($key = null, $default = null)
      *
      * @param   mixed   $key    The argument
      *
-     * @return  self
+     * @return  $this
      */
     public function unshift($key)
     {
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index fffbeb6a90..641d728464 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -274,7 +274,7 @@ public function toArray()
      *
      * @param   array|Config    $data   An array or a config
      *
-     * @return  self
+     * @return  $this
      */
     public function merge($data)
     {
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index e5afa37f96..d1817d24a4 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -183,7 +183,7 @@ public function getTablePrefix()
      *
      * @param   string $prefix
      *
-     * @return  self
+     * @return  $this
      */
     public function setTablePrefix($prefix)
     {
diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 5d0bf9ef60..2131231f80 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -63,7 +63,7 @@ public function __construct(SimpleQuery $query, $xAxisColumn, $yAxisColumn)
     /**
      * Prepare the queries used for the pre processing
      *
-     * @return  self
+     * @return  $this
      */
     protected function prepareQueries()
     {
@@ -82,7 +82,7 @@ protected function prepareQueries()
     /**
      * Set a default sorting for the x- and y-axis without losing any existing rules
      *
-     * @return  self
+     * @return  $this
      */
     protected function adjustSorting()
     {
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 704a6ff8a9..16f82cbe46 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -106,7 +106,7 @@ public function getDatasource()
      *
      * Query will return all available columns if none are given here
      *
-     * @return self
+     * @return $this
      */
     public function from($target, array $fields = null)
     {
@@ -125,7 +125,7 @@ public function from($target, array $fields = null)
      * @param   string  $condition
      * @param   mixed   $value
      *
-     * @return  self
+     * @return  $this
      */
     public function where($condition, $value = null)
     {
@@ -192,7 +192,7 @@ public function splitOrder($field)
      * @param  string   $field
      * @param  string   $direction
      *
-     * @return self
+     * @return $this
      */
     public function order($field, $direction = null)
     {
@@ -270,7 +270,7 @@ public function getOrder()
      * @param   int $count  Number of rows to return
      * @param   int $offset Start returning after this many rows
      *
-     * @return  self
+     * @return  $this
      */
     public function limit($count = null, $offset = null)
     {
@@ -417,7 +417,7 @@ public function count()
      *
      * @param   array $columns
      *
-     * @return  self
+     * @return  $this
      */
     public function columns(array $columns)
     {
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index bda091d858..b854e6d365 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -416,7 +416,7 @@ public function connect()
     /**
      * Disconnect in case we are connected to a Livestatus socket
      *
-     * @return self
+     * @return $this
      */
     public function disconnect()
     {
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index faa2124585..e727567eeb 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -211,7 +211,7 @@ public function setOnSuccess($onSuccess)
      *
      * @param   string  $label  The label to use for the submit button
      *
-     * @return  self
+     * @return  $this
      */
     public function setSubmitLabel($label)
     {
@@ -234,7 +234,7 @@ public function getSubmitLabel()
      *
      * @param   string|Url  $url    The url to redirect to
      *
-     * @return  self
+     * @return  $this
      */
     public function setRedirectUrl($url)
     {
@@ -263,7 +263,7 @@ public function getRedirectUrl()
      *
      * @param   string  $viewScript     The view script to use
      *
-     * @return  self
+     * @return  $this
      */
     public function setViewScript($viewScript)
     {
@@ -286,7 +286,7 @@ public function getViewScript()
      *
      * @param   bool    $disabled   Set true in order to disable CSRF protection for this form, otherwise false
      *
-     * @return  self
+     * @return  $this
      */
     public function setTokenDisabled($disabled = true)
     {
@@ -314,7 +314,7 @@ public function getTokenDisabled()
      *
      * @param   string  $name   The name to set
      *
-     * @return  self
+     * @return  $this
      */
     public function setTokenElementName($name)
     {
@@ -337,7 +337,7 @@ public function getTokenElementName()
      *
      * @param   bool    $disabled   Set true in order to disable identification for this form, otherwise false
      *
-     * @return  self
+     * @return  $this
      */
     public function setUidDisabled($disabled = true)
     {
@@ -365,7 +365,7 @@ public function getUidDisabled()
      *
      * @param   string  $name   The name to set
      *
-     * @return  self
+     * @return  $this
      */
     public function setUidElementName($name)
     {
@@ -388,7 +388,7 @@ public function getUidElementName()
      *
      * @param   bool    $state
      *
-     * @return  self
+     * @return  $this
      */
     public function setValidatePartial($state)
     {
@@ -525,7 +525,7 @@ public function getUseFormAutosubmit()
      *
      * @param   array   $formData   The data sent by the user
      *
-     * @return  self
+     * @return  $this
      */
     public function create(array $formData = array())
     {
@@ -593,7 +593,7 @@ public function onRequest()
      * Uses the label previously set with Form::setSubmitLabel(). Overwrite this
      * method in order to add multiple submit buttons or one with a custom name.
      *
-     * @return  self
+     * @return  $this
      */
     public function addSubmitButton()
     {
@@ -773,7 +773,7 @@ public function ensureElementAccessibility(Zend_Form_Element $element)
     /**
      * Add a field with a unique and form specific ID
      *
-     * @return  self
+     * @return  $this
      */
     public function addFormIdentification()
     {
@@ -795,7 +795,7 @@ public function addFormIdentification()
     /**
      * Add CSRF counter measure field to this form
      *
-     * @return  self
+     * @return  $this
      */
     public function addCsrfCounterMeasure()
     {
@@ -948,7 +948,7 @@ public function clearElements()
      * Overwrites Zend_Form::loadDefaultDecorators to avoid having
      * the HtmlTag-Decorator added and to provide viewscript usage
      *
-     * @return  self
+     * @return  $this
      */
     public function loadDefaultDecorators()
     {
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index a4bf596051..e95f14c88d 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -639,7 +639,7 @@ protected function flattenConfigs(array $configs)
      *
      * @param   array   $menus  The menus to load, as key-value array
      *
-     * @return  static
+     * @return  $this
      */
     protected function loadSubMenus(array $menus)
     {
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index 5ed617cb38..281d09beae 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -95,7 +95,7 @@ public function __unset($key)
      * @param   string      $key        Name of value
      * @param   mixed       $value      Value to set
      *
-     * @return  self
+     * @return  $this
      */
     public function set($key, $value)
     {
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 080a916fbd..3a12b5d77f 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -163,7 +163,7 @@ public static function fromPath($url, array $params = array(), $request = null)
      *
      * @param   string  $baseUrl    The url path to use as the Url Base
      *
-     * @return  self
+     * @return  $this
      */
     public function setBaseUrl($baseUrl)
     {
@@ -190,7 +190,7 @@ public function getBaseUrl()
      *
      * @param   string  $path   The path to set
      *
-     * @return  self
+     * @return  $this
      */
     public function setPath($path)
     {
@@ -250,7 +250,7 @@ public function getAbsoluteUrl($separator = '&')
      *
      * @param   array   $params     The parameters to add
      *
-     * @return  self
+     * @return  $this
      */
     public function addParams(array $params)
     {
@@ -266,7 +266,7 @@ public function addParams(array $params)
      *
      * @param   array   $params     The parameters to set
      *
-     * @return  self
+     * @return  $this
      */
     public function overwriteParams(array $params)
     {
@@ -282,7 +282,7 @@ public function overwriteParams(array $params)
      *
      * @param   UrlParams|array   $params     The new parameters to use for the query part
      *
-     * @return  self
+     * @return  $this
      */
     public function setParams($params)
     {
@@ -343,7 +343,7 @@ public function getParam($param, $default = null)
      * @param   string          $param      The query parameter name
      * @param   array|string    $value      An array or string to set as the parameter value
      *
-     * @return  self
+     * @return  $this
      */
     public function setParam($param, $value = true)
     {
@@ -356,7 +356,7 @@ public function setParam($param, $value = true)
      *
      * @param   string  $anchor     The site's anchor string without the '#'
      *
-     * @return  self
+     * @return  $this
      */
     public function setAnchor($anchor)
     {
@@ -369,7 +369,7 @@ public function setAnchor($anchor)
      *
      * @param   string|array    $keyOrArrayOfKeys   An array of strings or a string representing the key(s)
      *                                              of the parameters to be removed
-     * @return  self
+     * @return  $this
      */
     public function remove($keyOrArrayOfKeys)
     {
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index a38c1a229d..e25fa7e6c8 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -159,7 +159,7 @@ protected function urlEncode($value)
      * @param string $param The parameter you're interested in
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function add($param, $value = true)
     {
@@ -175,7 +175,7 @@ public function add($param, $value = true)
      * @param string $param Parameter name or param/value list
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function addValues($param, $values = null)
     {
@@ -231,7 +231,7 @@ public function setValues($param, $values = null)
      * @param string $param The parameter you're interested in
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function unshift($param, $value)
     {
@@ -248,7 +248,7 @@ public function unshift($param, $value)
      * @param string $param The parameter you want to set
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function set($param, $value)
     {
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 1265c7d212..79f6f7d70d 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -104,7 +104,7 @@ public function hasHelperFunction($name)
      *
      * @param  string  $name     The desired function name
      * @param  Closure $function An anonymous function
-     * @return self
+     * @return $this
      */
     public function addHelperFunction($name, Closure $function)
     {
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 258c9cf2e7..1d6a882f1b 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -64,7 +64,7 @@ public function activate($name)
     /**
      * Load Pane items provided by all enabled modules
      *
-     * @return  self
+     * @return  $this
      */
     public function load()
     {
@@ -241,7 +241,7 @@ public function getPanes()
      *
      * @param string $title
      *
-     * @return self
+     * @return $this
      */
     public function createPane($title)
     {
@@ -278,7 +278,7 @@ public function hasPane($pane)
      *
      * @param Pane $pane        The pane to add
      *
-     * @return self
+     * @return $this
      */
     public function addPane(Pane $pane)
     {
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 614caf845c..d972cc5d6b 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -119,7 +119,7 @@ public function getUrl()
      *
      * @param  string|Url $url  The url to use, either as an Url object or as a path
      *
-     * @return self
+     * @return $this
      */
     public function setUrl($url)
     {
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index b8edd0b520..5f973885ff 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -78,7 +78,7 @@ public function getTitle()
      *
      * @param string $title     The new title to use for this pane
      *
-     * @return self
+     * @return $this
      */
     public function setTitle($title)
     {
@@ -198,7 +198,7 @@ function ($e) {
      *                                                  (if a new dashlet will be created)
      * @param string|null $url                          An Url to be used when dashlet is a string
      *
-     * @return self
+     * @return $this
      * @throws \Icinga\Exception\ConfigurationError
      */
     public function addDashlet($dashlet, $url = null)
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index a53e5aee3f..be96b614eb 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -87,7 +87,7 @@ public static function create($name, array $sortFields)
      *
      * @param Request $request The request to use for populating the form
      *
-     * @return static $this
+     * @return $this
      */
     public function applyRequest($request)
     {
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 28e3fd3bdb..5132114f44 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -235,7 +235,7 @@ public function __construct(array $properties = array())
      *
      * @param  bool $active Whether the tab should be active
      *
-     * @return self
+     * @return $this
      */
     public function setActive($active = true)
     {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 70f0bd529a..770f5093f0 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -116,7 +116,7 @@ public function hideCloseButton()
      *
      * @param   string $name Name of the tab going to be activated
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ProgrammingError When the given tab name doesn't exist
      *
@@ -148,7 +148,7 @@ public function getActiveName()
      *
      * @param   string $name CSS class name(s)
      *
-     * @return  self
+     * @return  $this
      */
     public function setClass($name)
     {
@@ -194,7 +194,7 @@ public function get($name)
      * @param   string      $name   The new tab name
      * @param   array|Tab   $tab    The tab itself of its properties
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ProgrammingError When the tab name already exists
      */
@@ -219,7 +219,7 @@ public function add($name, $tab)
      * @param   string      $name   The new tab name
      * @param   array|Tab   $tab    The tab itself of its properties
      *
-     * @return  self
+     * @return  $this
      */
     public function set($name, $tab)
     {
@@ -236,7 +236,7 @@ public function set($name, $tab)
      *
      * @param   string  $name
      *
-     * @return  self
+     * @return  $this
      */
     public function remove($name)
     {
@@ -427,7 +427,7 @@ public function showOnlyCloseButton($value = true)
      *
      * @param   Tabextension $tabextension
      *
-     * @return  self
+     * @return  $this
      */
     public function extend(Tabextension $tabextension)
     {
diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index d25cd56e5b..bede003133 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -92,7 +92,7 @@ public function getParent()
      *
      * @param   Wizard  $wizard     The parent wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function setParent(Wizard $wizard)
     {
@@ -144,7 +144,7 @@ public function getPage($name)
      *
      * @param   Form|Wizard     $page   The page or wizard to add to the wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function addPage($page)
     {
@@ -166,7 +166,7 @@ public function addPage($page)
      *
      * @param   array   $pages      The pages or wizards to add to the wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function addPages(array $pages)
     {
@@ -221,7 +221,7 @@ public function getCurrentPage()
      *
      * @param   Form    $page   The page to set as current page
      *
-     * @return  self
+     * @return  $this
      */
     public function setCurrentPage(Form $page)
     {
@@ -504,7 +504,7 @@ public function isComplete()
      *
      * @param   bool    $state      Whether this wizard has been completed
      *
-     * @return  self
+     * @return  $this
      */
     public function setIsFinished($state = true)
     {
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index c05dc41a91..b2baea89c1 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -60,7 +60,7 @@ public function getInstanceForm($type)
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the resource already exists
      */
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index 355be8c200..d72dee491f 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -9,7 +9,7 @@ class Zend_View_Helper_CheckPerformance extends Zend_View_Helper_Abstract
     /**
      * Create dispatch instance
      *
-     * @return self
+     * @return $this
      */
     public function checkPerformance()
     {
diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 42fcd5b02c..32391b6ceb 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -6,7 +6,7 @@ class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
     /**
      * Create dispatch instance
      *
-     * @return self
+     * @return $this
      */
     public function checkPerformance()
     {
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index dfb590f45f..9134a97114 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -9,7 +9,7 @@ class Zend_View_Helper_RuntimeVariables extends Zend_View_Helper_Abstract
     /**
      * Create dispatch instance
      *
-     * @return self
+     * @return $this
      */
     public function runtimeVariables()
     {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index c87025fdd1..2e6bec0245 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -199,7 +199,7 @@ public function isAggregateColumn($column)
      * @param string $columnOrAlias         The column or column alias to order by
      * @param int $dir                      The sort direction or null to use default direction
      *
-     * @return self                         Fluent interface
+     * @return $this                         Fluent interface
      */
     public function order($columnOrAlias, $dir = null)
     {
@@ -487,7 +487,7 @@ public function getDefaultColumns()
      *
      * @param $alias                                The alias of the column to require
      *
-     * @return self                                 Fluent interface
+     * @return $this                                 Fluent interface
      * @see    IdoQuery::requireVirtualTable        The method initializing required joins
      * @throws \Icinga\Exception\ProgrammingError   When an unknown column is requested
      */
@@ -522,7 +522,7 @@ protected function hasAliasName($alias)
      * Require a virtual table for the given table name if not already required
      *
      * @param  String $name         The table name to require
-     * @return self                 Fluent interface
+     * @return $this                 Fluent interface
      */
     protected function requireVirtualTable($name)
     {
@@ -549,7 +549,7 @@ protected function conflictsWithVirtualTable($name)
      * This requires a join$Table() method to exist
      *
      * @param  String $table        The table to join by calling join$Table() in the concrete implementation
-     * @return self                 Fluent interface
+     * @return $this                 Fluent interface
      *
      * @throws \Icinga\Exception\ProgrammingError   If the join method for this table does not exist
      */
@@ -676,7 +676,7 @@ protected function createSubQuery($queryName, $columns = array())
      *
      * @param   array $columns
      *
-     * @return  self
+     * @return  $this
      */
     public function columns(array $columns)
     {
diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index e34035ee0b..df29a6b50e 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -239,7 +239,7 @@ public function getResource()
     /**
      * Backend entry point
      *
-     * @return self
+     * @return $this
      */
     public function select()
     {
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index f5bd9b786a..197a3fdb13 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -55,7 +55,7 @@ public function __construct()
      *
      * @param   string $path
      *
-     * @return  self
+     * @return  $this
      */
     public function setPath($path)
     {
@@ -78,7 +78,7 @@ public function getPath()
      *
      * @param   string $openMode
      *
-     * @return  self
+     * @return  $this
      */
     public function setOpenMode($openMode)
     {
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 7710abb116..866497a5a5 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -71,7 +71,7 @@ public function __construct()
      *
      * @param   string $host
      *
-     * @return  self
+     * @return  $this
      */
     public function setHost($host)
     {
@@ -94,7 +94,7 @@ public function getHost()
      *
      * @param   int $port
      *
-     * @return  self
+     * @return  $this
      */
     public function setPort($port)
     {
@@ -117,7 +117,7 @@ public function getPort()
      *
      * @param   string $user
      *
-     * @return  self
+     * @return  $this
      */
     public function setUser($user)
     {
@@ -142,7 +142,7 @@ public function getUser()
      *
      * @param   string $path
      *
-     * @return  self
+     * @return  $this
      */
     public function setPath($path)
     {
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index d0766ed3c1..b123b142d9 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -44,7 +44,7 @@ public function init()
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
@@ -57,7 +57,7 @@ public function setResourceConfig(array $config)
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setBackendConfig(array $config)
     {
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 0ec1de30fc..f3bce41faa 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -35,7 +35,7 @@ public function init()
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 9f4ed35a1e..f92fce1c3a 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -53,7 +53,7 @@ public function init()
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
@@ -66,7 +66,7 @@ public function setResourceConfig(array $config)
      *
      * @param   array   $privileges     The privileges
      *
-     * @return  self
+     * @return  $this
      */
     public function setDatabaseSetupPrivileges(array $privileges)
     {
@@ -79,7 +79,7 @@ public function setDatabaseSetupPrivileges(array $privileges)
      *
      * @param   array   $privileges     The privileges
      *
-     * @return  self
+     * @return  $this
      */
     public function setDatabaseUsagePrivileges(array $privileges)
     {
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 3635fc358d..acb2cd9af2 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -45,7 +45,7 @@ public function init()
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index 3ce50b7f12..2237a04ed5 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -32,7 +32,7 @@ public function init()
      *
      * @param   SetupWizard    $wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function setWizard(SetupWizard $wizard)
     {
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 18ffcebc8a..c680eaf7c6 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -64,7 +64,7 @@ public function getSubjectTitle()
      *
      * @param   array   $summary
      *
-     * @return  self
+     * @return  $this
      */
     public function setSummary(array $summary)
     {
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index f9628484c5..ebfa08a0b3 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -127,7 +127,7 @@ public function __construct(array $config)
     /**
      * Connect to the server
      *
-     * @return  self
+     * @return  $this
      */
     public function connectToHost()
     {
@@ -150,7 +150,7 @@ public function connectToHost()
     /**
      * Connect to the database
      *
-     * @return  self
+     * @return  $this
      */
     public function connectToDb()
     {