diff --git a/lib/_autoload.php b/lib/_autoload.php
index bbe3681ccf21241c682c7f0f8d21d3b0e429b364..03b5ec1808755803963e78f8408508e810d14e3e 100644
--- a/lib/_autoload.php
+++ b/lib/_autoload.php
@@ -1,21 +1,20 @@
 <?php
 
 /**
- * This file is a backwards compatible autoloader for simpleSAMLphp.
+ * This file is a backwards compatible autoloader for SimpleSAMLphp.
  * Loads the Composer autoloader.
  *
  * @author Olav Morken, UNINETT AS.
- * @package simpleSAMLphp
+ * @package SimpleSAMLphp
  */
 
 // SSP is loaded as a separate project
-if (file_exists(dirname(dirname(__FILE__)) . '/vendor/autoload.php')) {
-	require_once dirname(dirname(__FILE__)) . '/vendor/autoload.php';
-}
-// SSP is loaded as a library.
-else if (file_exists(dirname(dirname(__FILE__)) . '/../../autoload.php')) {
-	require_once dirname(dirname(__FILE__)) . '/../../autoload.php';
-}
-else {
-	throw new Exception('Unable to load Composer autoloader');
+if (file_exists(dirname(dirname(__FILE__)).'/vendor/autoload.php')) {
+    require_once dirname(dirname(__FILE__)).'/vendor/autoload.php';
+} else {  // SSP is loaded as a library.
+    if (file_exists(dirname(dirname(__FILE__)).'/../../autoload.php')) {
+        require_once dirname(dirname(__FILE__)).'/../../autoload.php';
+    } else {
+        throw new Exception('Unable to load Composer autoloader');
+    }
 }
diff --git a/lib/_autoload_modules.php b/lib/_autoload_modules.php
index fcbc110f08ae37d9e200f64b5a5568ac663a8a69..c4c85e4e4259e766d00a2dba73e05f69fdd2ed74 100644
--- a/lib/_autoload_modules.php
+++ b/lib/_autoload_modules.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * This file implements a autoloader for simpleSAMLphp modules.
+ * This file implements a autoloader for SimpleSAMLphp modules.
  *
  * @author Boy Baukema, SURFnet
- * @package simpleSAMLphp
+ * @package SimpleSAMLphp
  */
 
 /**
- * Autoload function for simpleSAMLphp modules.
+ * Autoload function for SimpleSAMLphp modules.
  *
  * @param string $className Name of the class.
  */