diff --git a/lib/SimpleSAML/Store.php b/lib/SimpleSAML/Store.php
index 7f227fca2a37000354e6705b2b5622379b07df36..74e761e4944760206672ab532688c1a05f25dd48 100644
--- a/lib/SimpleSAML/Store.php
+++ b/lib/SimpleSAML/Store.php
@@ -16,7 +16,7 @@ abstract class Store implements Utils\ClearableState
      *
      * This is false if the data store isn't enabled, and null if we haven't attempted to initialize it.
      *
-     * @var \SimpleSAML\Store|false|null
+     * @var \SimpleSAML\Store|bool|null
      */
     private static $instance;
 
diff --git a/modules/consent/lib/Consent/Store/Database.php b/modules/consent/lib/Consent/Store/Database.php
index a681220209b172f4d7bf4f2a3b4772fd9227584b..ba1975bc5b779ca2907e407b1b57c68e7535bc98 100644
--- a/modules/consent/lib/Consent/Store/Database.php
+++ b/modules/consent/lib/Consent/Store/Database.php
@@ -348,7 +348,7 @@ class Database extends \SimpleSAML\Module\consent\Store
      * @param string $statement  The statement which should be executed.
      * @param array  $parameters Parameters for the statement.
      *
-     * @return \PDOStatement|false  The statement, or false if execution failed.
+     * @return \PDOStatement|bool  The statement, or false if execution failed.
      */
     private function execute($statement, $parameters)
     {
diff --git a/modules/consentAdmin/hooks/hook_configpage.php b/modules/consentAdmin/hooks/hook_configpage.php
index 44ced16f2bf42b2d2ddf058aa581c182dfee57f7..2ea75afb1108e123dbe9c064e97d75e967cc672c 100644
--- a/modules/consentAdmin/hooks/hook_configpage.php
+++ b/modules/consentAdmin/hooks/hook_configpage.php
@@ -2,7 +2,7 @@
 /**
  * Hook to add the consentAdmin module to the config page.
  *
- * @param \SimpleSAML\XHTML\Template The template that we should alter in this hook.
+ * @param \SimpleSAML\XHTML\Template $template The template that we should alter in this hook.
  */
 
 function consentAdmin_hook_configpage(\SimpleSAML\XHTML\Template &$template)
diff --git a/modules/sanitycheck/hooks/hook_configpage.php b/modules/sanitycheck/hooks/hook_configpage.php
index cab7fbf1dcc944d830641a4a29ec2d3dd55e7e66..a4db0492e7139c7cdaed3741af3bbf45b0643e55 100644
--- a/modules/sanitycheck/hooks/hook_configpage.php
+++ b/modules/sanitycheck/hooks/hook_configpage.php
@@ -2,7 +2,7 @@
 /**
  * Hook to add the sanitycheck link to the config page.
  *
- * @param \SimpleSAML\XHTML\Template The template that we should alter in this hook.
+ * @param \SimpleSAML\XHTML\Template $template The template that we should alter in this hook.
  */
 function sanitycheck_hook_configpage(\SimpleSAML\XHTML\Template &$template)
 {