diff --git a/composer.json b/composer.json
index 2fdcc6d0d1f5388dfb891a7e22e1e3826cf0cc08..a6dbd1060071aa0a0f70d5f0b0940f7fc92e6c9e 100644
--- a/composer.json
+++ b/composer.json
@@ -9,5 +9,10 @@
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": "~1.13"
+    },
+    "autoload": {
+        "psr-4": {
+            "SimpleSAML\\modules\\pica\\": "lib/"
+        }
     }
 }
diff --git a/lib/Auth/Source/Pica.php b/lib/Auth/Source/Pica.php
index d46bfeda8ae2df14c836c42a0f6b5f467dae7131..547b210ede6050f187fa8da33b0be42e7d2f10b6 100644
--- a/lib/Auth/Source/Pica.php
+++ b/lib/Auth/Source/Pica.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SimpleSAML\Module\Auth\Source;
+
 /**
  * This file is part of SimpleSAMLphp Module Pica.
  *
@@ -17,7 +19,8 @@
  * along with SimpleSAMLphp Module Pica.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author    David Maus <maus@hab.de>
- * @copyright (c) 2015 by Herzog August Bibliothek Wolfenbüttel
+ * @author    Andy Brüchert <bruechert@hab.de>
+ * @copyright (c) 2015-2021 by Herzog August Bibliothek Wolfenbüttel
  * @license   http://www.gnu.org/licenses/gpl.txt GNU General Public License v3 or higher
  */
 
@@ -27,10 +30,11 @@ use HAB\Pica\Auth;
  * Authentication source for Pica-based library systems.
  *
  * @author    David Maus <maus@hab.de>
- * @copyright (c) 2015 by Herzog August Bibliothek Wolfenbüttel
+ * @author    Andy Brüchert <bruechert@hab.de>
+ * @copyright (c) 2015-2021 by Herzog August Bibliothek Wolfenbüttel
  * @license   http://www.gnu.org/licenses/gpl.txt GNU General Public License v3 or higher
  */
-class sspmod_pica_Auth_Source_Pica extends sspmod_core_Auth_UserPassBase
+class Pica extends \SimpleSAML\Module\core\Auth\UserPassBase
 {
     /**
      * Error message settings.