diff --git a/app/controllers/loncapa.php b/app/controllers/loncapa.php
index 41331b649a623384269ad3853e21acb161af6cb3..dd7ea4085b7a1d72583f5df4799e602e353e1735 100644
--- a/app/controllers/loncapa.php
+++ b/app/controllers/loncapa.php
@@ -13,8 +13,8 @@ class LoncapaController extends AuthenticatedController
         if ($GLOBALS['perm']->have_studip_perm('user', $course_id)
             && isset($GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms_type]))
         {
-            require_once 'lib/elearning/ELearningUtils.class.php';
-            require_once 'lib/elearning/ObjectConnections.class.php';
+            require_once 'lib/elearning/ELearningUtils.php';
+            require_once 'lib/elearning/ObjectConnections.php';
 
             $object_connections = new ObjectConnections($course_id);
             $connected_modules = $object_connections->getConnections();
diff --git a/app/controllers/quicksearch.php b/app/controllers/quicksearch.php
index 9c6a4ae67c20abaee553d082d6fa29eb79854a4e..c08649871018643650f88b4121d56a4a31436467 100644
--- a/app/controllers/quicksearch.php
+++ b/app/controllers/quicksearch.php
@@ -14,7 +14,7 @@
 
 /**
  * Controller for the ajax-response of the QuickSearch class found in
- * lib/classes/QuickSearch.class.php
+ * lib/classes/QuickSearch.php
  */
 class QuicksearchController extends AuthenticatedController
 {
diff --git a/cli/Commands/CleanupAdmissionRules.php b/cli/Commands/CleanupAdmissionRules.php
index 3079ae4c3ecad5462bdbecbdd7f6a0ef89ca7dde..a7036d3cef93cf57cdd1e1edff3b4b763d115813 100644
--- a/cli/Commands/CleanupAdmissionRules.php
+++ b/cli/Commands/CleanupAdmissionRules.php
@@ -18,7 +18,7 @@ class CleanupAdmissionRules extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        require_once 'lib/classes/admission/CourseSet.class.php';
+        require_once 'lib/classes/admission/CourseSet.php';
 
         $course_set = new \CourseSet();
 
diff --git a/cli/Commands/Plugins/PluginInfo.php b/cli/Commands/Plugins/PluginInfo.php
index 9809b138aa97f002105d16b409b9cd66de46bd58..c8f97483b1debe049cf822b5bb831223e73be62d 100644
--- a/cli/Commands/Plugins/PluginInfo.php
+++ b/cli/Commands/Plugins/PluginInfo.php
@@ -65,11 +65,11 @@ class PluginInfo extends AbstractPluginCommand
 
     private function pluginClassExists(string $plugindir, array $plugin)
     {
-        $pluginfile = $plugindir . $plugin['class'] . '.class.php';
+        $pluginfile = $plugindir . $plugin['class'] . '.php';
         if (file_exists($pluginfile)) {
             return 1;
         } else {
-            $pluginfile = $plugindir . $plugin['class'] . '.php';
+            $pluginfile = $plugindir . $plugin['class'] . '.class.php';
             if (file_exists($pluginfile)) {
                 return 1;
             }
diff --git a/composer.json b/composer.json
index dfb4fe19fd9fcafe80fbd816c016f658a023f508..920069f8daf46a3225ee8030257fefa2056fe140 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
             "Trails\\": "lib/trails/",
             "": [
                 "lib/calendar/",
-                "lib/calendar/lib/",
                 "lib/classes/",
                 "lib/classes/admission/",
                 "lib/classes/admission/userfilter/",
diff --git a/config/config_develop.inc.php b/config/config_develop.inc.php
index a38726a6c240060a019495e016b77f364d9f5e63..655fd4b0a9fa1e38f0cca3c6c51c5978153ef380 100644
--- a/config/config_develop.inc.php
+++ b/config/config_develop.inc.php
@@ -329,7 +329,7 @@ $INST_ADMIN_DATAFIELDS_VIEW = [
 /*
  * Fields that may not be hidden by users in their privacy settings.
  * Can be configured per permission level.
- * @see lib/models/User.class.php in function getHomepageElements for
+ * @see lib/models/User.php in function getHomepageElements for
  * available fields.
  * Entries look like "'field_name' => true".
  */
diff --git a/db/migrations/1.128_step00240_coursesets.php b/db/migrations/1.128_step00240_coursesets.php
index b767ae3acac53636f12b48d474c3e8c6d57d2586..2f47805a82a8dd9f67cbfa2d7d48c0ae37edface 100644
--- a/db/migrations/1.128_step00240_coursesets.php
+++ b/db/migrations/1.128_step00240_coursesets.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'vendor/phpass/PasswordHash.php';
-require_once 'lib/classes/admission/CourseSet.class.php';
+require_once 'lib/classes/admission/CourseSet.php';
 
 class Step00240CourseSets extends Migration
 {
diff --git a/db/migrations/1.12_step_120_userpic.php b/db/migrations/1.12_step_120_userpic.php
index f907b9ff9fa1197c653ca3782430104550d9d79e..eeb787abcb3eb6f8e716514e4f408ac26931d230 100644
--- a/db/migrations/1.12_step_120_userpic.php
+++ b/db/migrations/1.12_step_120_userpic.php
@@ -10,7 +10,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/classes/Avatar.class.php';
+require_once 'lib/classes/Avatar.php';
 
 class Step120Userpic extends Migration {
 
diff --git a/db/migrations/6.0.11_adjust_cronjobs.php b/db/migrations/6.0.11_adjust_cronjobs.php
new file mode 100644
index 0000000000000000000000000000000000000000..132885eb399a841d1ce896a92b2e69b62b4387c9
--- /dev/null
+++ b/db/migrations/6.0.11_adjust_cronjobs.php
@@ -0,0 +1,43 @@
+<?php
+return new class extends Migration
+{
+    private const ADJUSTMENTS = [
+        'lib/cronjobs/purge_cache',
+        'lib/cronjobs/check_admission',
+        'lib/cronjobs/session_gc',
+        'lib/cronjobs/cleanup_log',
+        'lib/cronjobs/garbage_collector',
+        'lib/cronjobs/send_mail_queue',
+        'lib/cronjobs/remind_oer_upload',
+        'lib/cronjobs/send_mail_notifications',
+    ];
+
+    public function description()
+    {
+        return 'Adjusts the class names for core cronjobs by losing the .class suffix';
+    }
+
+    protected function up()
+    {
+        $this->changeCronjobFilenames('.class.php', '.php');
+    }
+
+    protected function down()
+    {
+        $this->changeCronjobFilenames('.php', '.class.php');
+    }
+
+    private function changeCronjobFilenames(string $fromExtension, string $toExtension): void
+    {
+        $query = "UPDATE `cronjobs_tasks`
+                  SET `filename` = :new
+                  WHERE `filename` = :old";
+        $statement = DBManager::get()->prepare($query);
+
+        foreach (self::ADJUSTMENTS as $filename) {
+            $statement->bindValue(':new', $filename . $toExtension);
+            $statement->bindValue(':old', $filename . $fromExtension);
+            $statement->execute();
+        }
+    }
+};
diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
index 7fdbc00429efb53211a38c0662597390ca077c32..640e8006014af0330353d924491093b6a09907d1 100644
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
+++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ConditionalAdmission.class.php
+ * ConditionalAdmission.php
  *
  * An admission rule that specifies conditions for course admission, like
  * degree, study course or semester.
diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
index a3309e84cfa0d503895fea44253c8f897c77b490..139c36040bd816e9e206dbc4ebe123cf1f06454a 100644
--- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
+++ b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * CourseMemberAdmission.class.php
+ * CourseMemberAdmission.php
  *
  * Specifies a mandatory course membership for course admission.
  *
diff --git a/lib/admissionrules/limitedadmission/LimitedAdmission.php b/lib/admissionrules/limitedadmission/LimitedAdmission.php
index a193bda823a4c4df622315f232c25670f43a4ad8..d7f53c150177a714a736cc54e09db7b5adf4e91f 100644
--- a/lib/admissionrules/limitedadmission/LimitedAdmission.php
+++ b/lib/admissionrules/limitedadmission/LimitedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * LimitedAdmission.class.php
+ * LimitedAdmission.php
  *
  * Represents rules for admission to a limited number of courses.
  *
diff --git a/lib/admissionrules/lockedadmission/LockedAdmission.php b/lib/admissionrules/lockedadmission/LockedAdmission.php
index 0ca324b41f9cc1423876e1ac38e9470ece4723fb..92ef5137e40ce8473f5f9e2d579862efea426523 100644
--- a/lib/admissionrules/lockedadmission/LockedAdmission.php
+++ b/lib/admissionrules/lockedadmission/LockedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * LockedAdmission.class.php
+ * LockedAdmission.php
  * 
  * Represents a rule for completely locking courses for admission.
  *
diff --git a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
index 28a910dab8c9b5f4026013825547617f113708e7..586f82f6ef7789fe3c09e1ef36ef846ec70e1ac4 100644
--- a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
+++ b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ParticipantRestrictedAdmission.class.php
+ * ParticipantRestrictedAdmission.php
  *
  * Specifies restricted number of participants for course admission.
  *
diff --git a/lib/admissionrules/passwordadmission/PasswordAdmission.php b/lib/admissionrules/passwordadmission/PasswordAdmission.php
index 06506306ccc0134eb33d6caba3b350867203c2f4..871502113d31c7f1e43ee136adb8588659970c77 100644
--- a/lib/admissionrules/passwordadmission/PasswordAdmission.php
+++ b/lib/admissionrules/passwordadmission/PasswordAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PasswordAdmission.class.php
+ * PasswordAdmission.php
  *
  * Represents a rule for course access with a given password.
  *
diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
index 9c90f69d3302985d0298ed732a068ebb7b5c946f..2f57a446622db3397cefc202c0c7ec436a09d394 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PreferentialAdmission.class.php
+ * PreferentialAdmission.php
  *
  * An admission rule that favors selected courses of study or semesters of study.
  *
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.php b/lib/admissionrules/termsadmission/TermsAdmission.php
index 1d421adadf700697a8bd03ad95e6afe6647e9113..eb83dfcc2d07331a8e4abee4296c75991df26e38 100644
--- a/lib/admissionrules/termsadmission/TermsAdmission.php
+++ b/lib/admissionrules/termsadmission/TermsAdmission.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * TermsAdmission.class.php
+ * TermsAdmission.php
  *
  * Represents a rule for course access with conditions of admission to be accepted.
  *
diff --git a/lib/admissionrules/timedadmission/TimedAdmission.php b/lib/admissionrules/timedadmission/TimedAdmission.php
index e167bd83fe6e6fd30ce095a213e56a6872740495..5f5e88570c41d3c2111e530e1516895343be7b3a 100644
--- a/lib/admissionrules/timedadmission/TimedAdmission.php
+++ b/lib/admissionrules/timedadmission/TimedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * TimedAdmission.class.php
+ * TimedAdmission.php
  *
  * Specifies a time frame for course admission.
  *
diff --git a/lib/calendar/CalendarColumn.php b/lib/calendar/CalendarColumn.php
index cc3abea5310f239cb32e63f58932a79c4c407b97..78a38090e6d0d7bb1cd2b13e468681268c00dcb8 100644
--- a/lib/calendar/CalendarColumn.php
+++ b/lib/calendar/CalendarColumn.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * CalendarColumn.class.php - a column for a CalendarView
+ * CalendarColumn.php - a column for a CalendarView
  *
  * This class represents an entry-column like "monday" in the calendar
  *
diff --git a/lib/calendar/CalendarView.php b/lib/calendar/CalendarView.php
index 3d89ef19261b4b0424999d2a0d4a2d13de6a68ce..9d9ebc29556baedc579e292a6037d3c9b0431f11 100644
--- a/lib/calendar/CalendarView.php
+++ b/lib/calendar/CalendarView.php
@@ -2,7 +2,7 @@
 # Lifter010: TODO
 
  /**
- * CalendarView.class.php - generates a calendar
+ * CalendarView.php - generates a calendar
  *
  * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
  *
diff --git a/lib/calendar/CalendarWeekView.php b/lib/calendar/CalendarWeekView.php
index c1e0f24718ff2d9fb78b479fd045aa44fb3b2028..1d14ca2188f6defe8fa4294987e0e1d4ea1cb3da 100644
--- a/lib/calendar/CalendarWeekView.php
+++ b/lib/calendar/CalendarWeekView.php
@@ -2,7 +2,7 @@
 # Lifter010: TODO
 
 /**
- * CalendarWeekView.class.php - a specialized calendar view for displaying weeks
+ * CalendarWeekView.php - a specialized calendar view for displaying weeks
  *
  * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
  *
diff --git a/lib/classes/ActionMenu.php b/lib/classes/ActionMenu.php
index 0822f721163317a8b4f3bbee201083845677100e..25351ce5ac3d58edaadd04a41ee87f45de505fab 100644
--- a/lib/classes/ActionMenu.php
+++ b/lib/classes/ActionMenu.php
@@ -410,7 +410,7 @@ class ActionMenu
         $rendering_mode = $this->rendering_mode;
 
         if ($rendering_mode === null) {
-            $rendering_mode = $this->countActions() <= Config::get()->ACTION_MENU_THRESHOLD
+            $rendering_mode = $this->countActions() <= 1 // Config::get()->ACTION_MENU_THRESHOLD
                             ? self::RENDERING_MODE_ICONS
                             : self::RENDERING_MODE_MENU;
         }
diff --git a/lib/classes/Assets.php b/lib/classes/Assets.php
index 928c47c3e369eb55eb4e1f88628e91e8f8002477..d4d792e64b769ad0062f39810d0fa187fb3f1b35 100644
--- a/lib/classes/Assets.php
+++ b/lib/classes/Assets.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 
 /*
- * Assets.class.php - assets helper
+ * Assets.php - assets helper
  *
  * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
  *
diff --git a/lib/classes/AuthorObject.php b/lib/classes/AuthorObject.php
index b3e98e3a8ef6d22f1697610260d356502a52133f..f08622e3625a08ca72b22461bd0434aef40a0b5a 100644
--- a/lib/classes/AuthorObject.php
+++ b/lib/classes/AuthorObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// AuthorObject.class.php
+// AuthorObject.php
 //
 // Class to provide basic properties of an object in Stud.IP
 //
@@ -31,7 +31,7 @@ define("ERROR_CRITICAL", "8");
 
 
 /**
- * AuthorObject.class.php
+ * AuthorObject.php
  *
  * Class to provide basic properties of an object in Stud.IP
  *
@@ -136,4 +136,3 @@ class AuthorObject
         $class->resetErrors();
     }
 }
-
diff --git a/lib/classes/AutoInsert.php b/lib/classes/AutoInsert.php
index b2168ccfbe682ef1e1ecc25ed609c91176c8343b..b5cc00553c992c7bafe92e2a40d8bb4adbd88fe5 100644
--- a/lib/classes/AutoInsert.php
+++ b/lib/classes/AutoInsert.php
@@ -14,7 +14,7 @@
  */
 
 /**
- * AutoInsert.class.php
+ * AutoInsert.php
  * Provides functions required by StEP00216:
  * - Assign seminars for automatic registration of certain user types
  * - Maintenance of registration rules
diff --git a/lib/classes/Color.php b/lib/classes/Color.php
index a9b4506bc20b9b6042399e3f3012c56b560d76a6..dcd68f55fcf1375688edf39927ea02e09adcbbe8 100644
--- a/lib/classes/Color.php
+++ b/lib/classes/Color.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * lib/classes/Color.class.php - class to mix colors and convert them between different types
+ * lib/classes/Color.php - class to mix colors and convert them between different types
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -367,4 +367,4 @@ class Color {
         return [$H, $S, $L];
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/classes/Config.php b/lib/classes/Config.php
index 642665db5f5c1182e02f8e303a21ea188178e7a4..c49a8455afae469d04e1b85b11d6881597743dd1 100644
--- a/lib/classes/Config.php
+++ b/lib/classes/Config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Config.class.php
+ * Config.php
  * provides access to global configuration
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/CourseConfig.php b/lib/classes/CourseConfig.php
index ad62be087655fd0ba7e42dc4dc07f8ca268e6687..3ac55875f1fad6cd827ed047ec59f5c358ad03f4 100644
--- a/lib/classes/CourseConfig.php
+++ b/lib/classes/CourseConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CourseConfig.class.php
+ * CourseConfig.php
  * provides access to course preferences
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/CronJob.php b/lib/classes/CronJob.php
index 1e7fb4121238e0ba30c3ec42823c475465196f88..dee65e7327bc4408a7b5cdea25e8f3fc412054f2 100644
--- a/lib/classes/CronJob.php
+++ b/lib/classes/CronJob.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// Cronjob.class.php
+// Cronjob.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/CronjobScheduler.php b/lib/classes/CronjobScheduler.php
index cc4cf8b0201524308077ea1fbe2ec5c3bbe21cd8..fbb5b66f82eb3f715aaebbff3ce2aeaa3f5bf5ba 100644
--- a/lib/classes/CronjobScheduler.php
+++ b/lib/classes/CronjobScheduler.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobScheduler.class.php
+// CronjobScheduler.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/DataFieldEntry.php b/lib/classes/DataFieldEntry.php
index fd50a0bb673df91973a1da4d5d027fc8efffb893..eca0b4ae2621ef1d4e2f0d29ba44b9e3812ea8f4 100644
--- a/lib/classes/DataFieldEntry.php
+++ b/lib/classes/DataFieldEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DataFieldEntry.class.php
+ * DataFieldEntry.php
  *
  * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @author  Marcus Lunzenauer <mlunzena@uos.de>
diff --git a/lib/classes/DatabaseObject.php b/lib/classes/DatabaseObject.php
index 2258adb4eb6ce15fc3e41e2d8d64899ec46689d2..5c5422915410bfc80456847ae2092440f9decc1b 100644
--- a/lib/classes/DatabaseObject.php
+++ b/lib/classes/DatabaseObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// DatabaseObject.class.php
+// DatabaseObject.php
 //
 // Class to provide basic properties of an DatabseObject in Stud.IP
 //
@@ -35,7 +35,7 @@ define("INSTANCEOF_DATABASEOBJECT", "DatabaseObject");
 
 
 /**
- * DatabaseObject.class.php
+ * DatabaseObject.php
  *
  * Class to provide basic properties of an DatabaseObject in Stud.IP
  *
diff --git a/lib/classes/DateFormatter.php b/lib/classes/DateFormatter.php
index 5f7c558321e8563455103085c28047a7a611deaf..5309cbc92dba6670e2614c4f072d09c4115fa313 100644
--- a/lib/classes/DateFormatter.php
+++ b/lib/classes/DateFormatter.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * DateFormater.class.php - Handles the formatting of one date and associated rooms.
+ * DateFormater.php - Handles the formatting of one date and associated rooms.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/DbSnapshot.php b/lib/classes/DbSnapshot.php
index dfb4f89668673ff8ff25141e327f5f7aaa765a2d..33ea6600a388b95ec94cf5575e0cf7a2dde2f54f 100644
--- a/lib/classes/DbSnapshot.php
+++ b/lib/classes/DbSnapshot.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// DbSnapshot.class.php
+// DbSnapshot.php
 // Class to provide snapshots of mysql result sets
 // Uses PHPLib DB Abstraction
 // Copyright (c) 2002 André Noack <andre.noack@gmx.net>
diff --git a/lib/classes/DbView.php b/lib/classes/DbView.php
index 81e9b9112d139afabf65367eb2ad47ce93c93a16..0215f8ed7296f3b270e19a8dbc6aa0c40d4b1ed8 100644
--- a/lib/classes/DbView.php
+++ b/lib/classes/DbView.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// DbView.class.php
+// DbView.php
 // Class to provide simple Views and Prepared Statements
 // Mainly for MySql, may work with other DBs (not tested)
 // Copyright (c) 2002 André Noack <andre.noack@gmx.net>
diff --git a/lib/classes/InstituteCalendarHelper.php b/lib/classes/InstituteCalendarHelper.php
index 4302cf10168f136f2959e9f26e53fc617bdb7623..6c934b4968b1030088d418d6d5bd754cf45254b7 100644
--- a/lib/classes/InstituteCalendarHelper.php
+++ b/lib/classes/InstituteCalendarHelper.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InstituteCalendarHelper.class.php - class for institute calendar convenience functions
+ * InstituteCalendarHelper.php - class for institute calendar convenience functions
  *
  * @author      Timo Hartge <hartge@data-quest>
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
diff --git a/lib/classes/InstituteConfig.php b/lib/classes/InstituteConfig.php
index d1a51cb8adf3b5ad6a5d54655091692df19732a6..551ea4d496ade9a275b417cdd084bb211f5f8fc1 100644
--- a/lib/classes/InstituteConfig.php
+++ b/lib/classes/InstituteConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InstituteConfig.class.php
+ * InstituteConfig.php
  * provides access to institute preferences
  *
  * @author  Jan-Hendrik Wullms <tleilax+studip@gmail.com>
diff --git a/lib/classes/LockRules.php b/lib/classes/LockRules.php
index 59679db6258ecd2c518d5bae158a6a99f005c547..f1feb9ff0c076484f3b3987ff61ea583703218e1 100644
--- a/lib/classes/LockRules.php
+++ b/lib/classes/LockRules.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LockRules.class.php
+ * LockRules.php
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
 */
 
 /**
-* LockRules.class.php
+* LockRules.php
 *
 * This class contains only static methods dealing with lock rules
 *
diff --git a/lib/classes/MVV.php b/lib/classes/MVV.php
index 517514c289c61976c2827e86cbefccd6965bc2bc..b4d9edf6eec9101e18662df2e4f16eaec1332145 100644
--- a/lib/classes/MVV.php
+++ b/lib/classes/MVV.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MVV.class.php
+ * MVV.php
  * Helper class
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/Markup.php b/lib/classes/Markup.php
index fbde67b07bfb02d682cd0f460709f19a4153f4a6..dc6820f489fd2d6ec5c5ee3bdb34fff456cafbbd 100644
--- a/lib/classes/Markup.php
+++ b/lib/classes/Markup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Markup.class.php - Handling of Stud.IP- and HTML-markup.
+ * Markup.php - Handling of Stud.IP- and HTML-markup.
  **
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/MessageBox.php b/lib/classes/MessageBox.php
index 8936ebec08790e152a1ce836c378a203e0386134..3573018d2e6d6ceffc1a20a7fcffe138697a630c 100644
--- a/lib/classes/MessageBox.php
+++ b/lib/classes/MessageBox.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * MessageBox.class.php
+ * MessageBox.php
  *
  * html boxes for different kinds of messages
  *
diff --git a/lib/classes/ModulesNotification.php b/lib/classes/ModulesNotification.php
index f41407140b131d09da612907fc0ae2e3ae8fe4c1..1dc361c1f38daff33c0ac80e69febdaf3fd0cbc9 100644
--- a/lib/classes/ModulesNotification.php
+++ b/lib/classes/ModulesNotification.php
@@ -4,7 +4,7 @@
 # Lifter003: TEST
 # Lifter010: DONE - no html output in this file
 /**
-* ModulesNotification.class.php
+* ModulesNotification.php
 *
 * check for modules (global and local for institutes and Veranstaltungen), read and write
 *
@@ -17,7 +17,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// Modules.class.php
+// Modules.php
 // Checks fuer Module (global und lokal fuer Veranstaltungen und Einrichtungen), Schreib-/Lesezugriff
 // Copyright (C) 2003 Cornelis Kater <ckater@gwdg.de>, Suchi & Berg GmbH <info@data-quest.de>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/MultiPersonSearch.php b/lib/classes/MultiPersonSearch.php
index af10e6be86980fc5bf6a1744126a89c8733d4637..3ca617bfed203570bae42b8226545410a4199673 100644
--- a/lib/classes/MultiPersonSearch.php
+++ b/lib/classes/MultiPersonSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MultiPersonSearch.class.php
+ * MultiPersonSearch.php
  *
  * This class provides a GUI-element for searching, adding and removing
  * multiple persons. If JavaScript is enabled the GUI-element is shown
@@ -242,7 +242,7 @@ class MultiPersonSearch {
     /**
      * sets the search object.
      *
-     * @param SearchType object of type SearchType (e.g. SQLSearch.class.php)
+     * @param SearchType object of type SearchType (e.g. SQLSearch.php)
      *
      * @return MultiPersonSearch
      */
diff --git a/lib/classes/MvvQuickSearch.php b/lib/classes/MvvQuickSearch.php
index b0e79c03b991b9eeee2d7fa3b8d684e28002ab09..b06de4f62ec1f56bf8b619491fff9cfaf35ba07a 100644
--- a/lib/classes/MvvQuickSearch.php
+++ b/lib/classes/MvvQuickSearch.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'lib/classes/searchtypes/SQLSearch.class.php';
+require_once 'lib/classes/searchtypes/SQLSearch.php';
 
 class MvvQuickSearch extends SQLSearch
 {
diff --git a/lib/classes/NotificationCenter.php b/lib/classes/NotificationCenter.php
index aaaa9e8f3f0add9a59abc78fd82689c37e792cb0..178fd62f0f7d571bee34792d21255dddf890031d 100644
--- a/lib/classes/NotificationCenter.php
+++ b/lib/classes/NotificationCenter.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * NotificationCenter.class.php - NotificationCenter class
+ * NotificationCenter.php - NotificationCenter class
  *
  * Copyright (c) 2009  Elmar Ludwig
  *
diff --git a/lib/classes/QuickSearch.php b/lib/classes/QuickSearch.php
index d3983a33bc73369cc4481e2ab4d980d040a0c2e1..f3e18cc27ea2d80ab05a5d41aa8292d7d474d754 100644
--- a/lib/classes/QuickSearch.php
+++ b/lib/classes/QuickSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * QuickSearch.class.php - GUI class for quciksearch
+ * QuickSearch.php - GUI class for quciksearch
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -66,7 +66,7 @@
  *  $searcher = new TeacherSearch();
  *  print QuickSearch::get("username", $searcher)->withButton->render();
  *  //code-end
- * Watch the SearchType class in lib/classes/searchtypes/SearchType.class.php
+ * Watch the SearchType class in lib/classes/searchtypes/SearchType.php
  * for details.
  * Enjoy!
  */
@@ -166,7 +166,7 @@ class QuickSearch
     /**
      * constructor which prepares a searchfield for persons, courses, institutes or
      * special items you may want to search for. This is a GUI-class, see
-     * QuickSearch.class.php for further documentation.
+     * QuickSearch.php for further documentation.
      *
      * @param string $name the name of the destinated variable in your html-form. Handle it
      * as if it was an '<input type="text" name="yourname">' input.
diff --git a/lib/classes/RangeConfig.php b/lib/classes/RangeConfig.php
index b1030e3961520682efd3b15a1d4c1adfc8d65ccd..ad482077855324eadb7287e1aa040bda5584377d 100644
--- a/lib/classes/RangeConfig.php
+++ b/lib/classes/RangeConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * RangeConfig.class.php
+ * RangeConfig.php
  * provides access to object preferences
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/RangeTreeObject.php b/lib/classes/RangeTreeObject.php
index 579db4359891bd0cc9da7b637f04ded20004be57..06f84bf714ed188b59b57ed721d86faa533c0ff1 100644
--- a/lib/classes/RangeTreeObject.php
+++ b/lib/classes/RangeTreeObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// RangeTreeObject.class.php
+// RangeTreeObject.php
 // Class to handle items in the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/RangeTreeObjectFak.php b/lib/classes/RangeTreeObjectFak.php
index 76cc366572d4bb76c6f302ea2db93ed820a493c3..9e980cac6a1172058c75ac113eea5713338aeda0 100644
--- a/lib/classes/RangeTreeObjectFak.php
+++ b/lib/classes/RangeTreeObjectFak.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// RangeTreeObjectFak.class.php
+// RangeTreeObjectFak.php
 // Class to handle items in the "range tree"
 // 
 // Copyright (c) 2002 André Noack <noack@data-quest.de> 
diff --git a/lib/classes/RangeTreeObjectInst.php b/lib/classes/RangeTreeObjectInst.php
index c291dfc7a248818992be80eee40ca799010b190f..d41b03d088cb1bd56008153865f4933f55b1993a 100644
--- a/lib/classes/RangeTreeObjectInst.php
+++ b/lib/classes/RangeTreeObjectInst.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// RangeTreeObjectInst.class.php
+// RangeTreeObjectInst.php
 // Class to handle items in the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/Score.php b/lib/classes/Score.php
index 4d114d5d4b547cb2a0b25aa18239b1695d9d89e1..3b7f149063725a9c0f238f84bc7f255e50268fed 100644
--- a/lib/classes/Score.php
+++ b/lib/classes/Score.php
@@ -1,6 +1,6 @@
 <?
 /**
- * Score.class.php - Score class
+ * Score.php - Score class
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/Seminar.php b/lib/classes/Seminar.php
index a2d69eaf0943637bf8189faca906ab598e85b746..0fccdbce6455da0cd6c099f656dd4f4d8522eed3 100644
--- a/lib/classes/Seminar.php
+++ b/lib/classes/Seminar.php
@@ -4,7 +4,7 @@
 # Lifter007: TODO
 # Lifter010: TODO
 /**
- * Seminar.class.php - This class represents a Seminar in Stud.IP
+ * Seminar.php - This class represents a Seminar in Stud.IP
  *
  * This class provides functions for seminar-members, seminar-dates, and seminar-modules
  *
diff --git a/lib/classes/SeminarCategories.php b/lib/classes/SeminarCategories.php
index 5302f1e3dcf0f9c93a051879abb4ee6c8cdf6675..25eb4c10abe02a0b08bf1d1dd2b458401d1e032a 100644
--- a/lib/classes/SeminarCategories.php
+++ b/lib/classes/SeminarCategories.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /**
- * SeminarCategories.class.php
+ * SeminarCategories.php
  *
  * encapsulates configuration settings for courses from config.inc.php
  * aka $SEM_CLASS, $SEM_TYPE, $UPLOAD_TYPES
@@ -14,7 +14,7 @@
  */
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SeminarCategories.class.php
+// SeminarCategories.php
 //
 // Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/SessionDecoder.php b/lib/classes/SessionDecoder.php
index d437494cf9cf3881c7d866d82e9c35f1cf7bee03..fc40c076e77aaf7a6992cd56ba4f1228891f67e2 100644
--- a/lib/classes/SessionDecoder.php
+++ b/lib/classes/SessionDecoder.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /**
- * SessionDecoder.class.php
+ * SessionDecoder.php
  *
  * decodes serialized PHP session data
  *
@@ -13,7 +13,7 @@
  */
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SessionDecoder.class.php
+// SessionDecoder.php
 //
 // Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/SimpleCollection.php b/lib/classes/SimpleCollection.php
index 6acc10d4d4090696d7b80e924eb4d757e2dff37e..ae773f5b581f59c7f72dd7ad3f593e612f839616 100644
--- a/lib/classes/SimpleCollection.php
+++ b/lib/classes/SimpleCollection.php
@@ -7,7 +7,7 @@ if (!defined('SORT_FLAG_CASE')) {
 }
 
 /**
- * SimpleCollection.class.php
+ * SimpleCollection.php
  * collection of assoc arrays with convenience
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/SimpleORMap.php b/lib/classes/SimpleORMap.php
index 7124cc401926f7bcbd8c12a0a5082e4ea6a8cfb3..7492906519b65f0fc976a7dfac6dc01f6aec7086 100644
--- a/lib/classes/SimpleORMap.php
+++ b/lib/classes/SimpleORMap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SimpleORMap.class.php
+ * SimpleORMap.php
  * simple object-relational mapping
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/SimpleORMapCollection.php b/lib/classes/SimpleORMapCollection.php
index 7debb80eaad2bd33b7b40fb575478f8d77bf79d7..20162e5613d79903c845854761838f9b9a6e0b5f 100644
--- a/lib/classes/SimpleORMapCollection.php
+++ b/lib/classes/SimpleORMapCollection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SimpleORMapCollection.class.php
+ * SimpleORMapCollection.php
  * simple object-relational mapping
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/StudipAutoloader.php b/lib/classes/StudipAutoloader.php
index 7054478d442ad8060925438c7d91165164a7bf25..883adc725fc621953c078bb7ba9eee8f53bd6730 100644
--- a/lib/classes/StudipAutoloader.php
+++ b/lib/classes/StudipAutoloader.php
@@ -52,8 +52,8 @@ class StudipAutoloader
     // file is found quickly and unneccessary, costly calls to file_exists()
     // can be avoided.
     protected static $file_extensions = [
-        '.class.php',
         '.php',
+        '.class.php',
         '.interface.php',
     ];
 
diff --git a/lib/classes/StudipForm.php b/lib/classes/StudipForm.php
index 024e2e3e578bb6976db502a73d7480e5b43d48ca..12029df193b4c1b081fbcfa111fd1a797ff0d997 100644
--- a/lib/classes/StudipForm.php
+++ b/lib/classes/StudipForm.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipForm.class.php
+// StudipForm.php
 // Class to build HTML formular and handle persistence using PhpLib
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipLock.php b/lib/classes/StudipLock.php
index 601db8b10acdf7726badf45dfa6171f1cce7d041..ce5752f5a6bb25740b8e14d1d8333218040a3fe6 100644
--- a/lib/classes/StudipLock.php
+++ b/lib/classes/StudipLock.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipLock.class.php
+ * StudipLock.php
  * class with methods to perform cooperative advisory locking
  * using the GET_LOCK feature from Mysql
  * https://dev.mysql.com/doc/refman/5.0/en/miscellaneous-functions.html#function_get-lock
diff --git a/lib/classes/StudipMail.php b/lib/classes/StudipMail.php
index 4974f660260705314cc8570b7c0a139b691e27ed..c5178474ec8fae906cb7dafd9336644c72e0082d 100644
--- a/lib/classes/StudipMail.php
+++ b/lib/classes/StudipMail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipMail.class.php
+ * StudipMail.php
  *
  * class for constructing and sending emails in Stud.IP
  *
diff --git a/lib/classes/StudipObject.php b/lib/classes/StudipObject.php
index 151fcdb85971475a397da579273f6e10133e4598..5f10c86af60eb4f2620d9325686e1314b6b2afa9 100644
--- a/lib/classes/StudipObject.php
+++ b/lib/classes/StudipObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipObject.class.php
+// StudipObject.php
 //
 // Class to provide basic properties of an StudipObject in Stud.IP
 //
@@ -36,7 +36,7 @@ define ("INSTANCEOF_STUDIPOBJECT", "StudipObject");
 
 
 /**
- * StudipObject.class.php
+ * StudipObject.php
  *
  * Class to provide basic properties of an StudipObject in Stud.IP
  *
diff --git a/lib/classes/StudipPDO.php b/lib/classes/StudipPDO.php
index 8a1422b1a8e880eba2754932fa2f52327089cfe3..77046f7e796b195f0c506a9fa1295475181ba0c7 100644
--- a/lib/classes/StudipPDO.php
+++ b/lib/classes/StudipPDO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipPDO.class.php - Stud.IP PDO class
+ * StudipPDO.php - Stud.IP PDO class
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/StudipRangeTree.php b/lib/classes/StudipRangeTree.php
index cf88d231cf0de78408789d5ddc29cfdb5187eb15..5e1aefee151c6b68228892ea78398ebad00d5df4 100644
--- a/lib/classes/StudipRangeTree.php
+++ b/lib/classes/StudipRangeTree.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipRangeTree.class.php
+// StudipRangeTree.php
 // Class to handle structure of the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipRangeTreeView.php b/lib/classes/StudipRangeTreeView.php
index 2532e4b6308ce924853c1dddedbf172805728cb7..7b230891df8e0030c9d270e699842153356feb9c 100644
--- a/lib/classes/StudipRangeTreeView.php
+++ b/lib/classes/StudipRangeTreeView.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipRangeTreeView.class.php
+// StudipRangeTreeView.php
 // Class to print out the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipRangeTreeViewAdmin.php b/lib/classes/StudipRangeTreeViewAdmin.php
index 062095781760e128726670ed862895d41cd41e47..1c5e5a1d1098139dfb225124be0f5df72f8503a2 100644
--- a/lib/classes/StudipRangeTreeViewAdmin.php
+++ b/lib/classes/StudipRangeTreeViewAdmin.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipRangeTreeViewAdmin.class.php
+// StudipRangeTreeViewAdmin.php
 // Class to print out the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemRangeTreeViewSimple.php b/lib/classes/StudipSemRangeTreeViewSimple.php
index eecdd70cd1fd4a84592f0502944330e85550b1bd..78b5ccfe044857b38a74a9c927d50dd32ab218a8 100644
--- a/lib/classes/StudipSemRangeTreeViewSimple.php
+++ b/lib/classes/StudipSemRangeTreeViewSimple.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemRangeTreeViewSimple.class.php
+// StudipSemRangeTreeViewSimple.php
 // Class to print out the seminar tree
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemSearch.php b/lib/classes/StudipSemSearch.php
index 8932dd125006568f0f23e927cb3392d968e3b9e7..6d86b444f4db1b04ecc98eb3a481589a5ffd2df3 100644
--- a/lib/classes/StudipSemSearch.php
+++ b/lib/classes/StudipSemSearch.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemSearchForm.class.php
+// StudipSemSearchForm.php
 // Class to build search formular and execute search
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemSearchHelper.php b/lib/classes/StudipSemSearchHelper.php
index 29ee5d37a1846bdbf76e1cf89e13aa742941994d..d22186933020bc3608ebfa13332c088d774fa94c 100644
--- a/lib/classes/StudipSemSearchHelper.php
+++ b/lib/classes/StudipSemSearchHelper.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemSearchHelper.class.php
+// StudipSemSearchHelper.php
 //
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeSearch.php b/lib/classes/StudipSemTreeSearch.php
index e79a34fa29efa511a0e902d7c13dbe44a821a12f..0d8f9355d5ad2edb03109766fbc0f3d6cad400b8 100644
--- a/lib/classes/StudipSemTreeSearch.php
+++ b/lib/classes/StudipSemTreeSearch.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeSearch.class.php
+// StudipSemTreeSearch.php
 // Class to build search formular and execute search
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeView.php b/lib/classes/StudipSemTreeView.php
index 3e984cc8313ef27be1badab20b69534e2677877e..f2d6fbecf678900035836394f1c9f5599086be56 100644
--- a/lib/classes/StudipSemTreeView.php
+++ b/lib/classes/StudipSemTreeView.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeView.class.php
+// StudipSemTreeView.php
 // Class to print out the seminar tree
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeViewAdmin.php b/lib/classes/StudipSemTreeViewAdmin.php
index edc65c8b3a7865e1a76ed790cb9667adb745aab3..59c926adfd064fcb7c68c4e25481dcb34e7d432f 100644
--- a/lib/classes/StudipSemTreeViewAdmin.php
+++ b/lib/classes/StudipSemTreeViewAdmin.php
@@ -7,7 +7,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeViewAdmin.class.php
+// StudipSemTreeViewAdmin.php
 // Class to print out the seminar tree in administration mode
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeViewSimple.php b/lib/classes/StudipSemTreeViewSimple.php
index e2dba76020318f1e244f5f6c7b62373560d3fa63..239275b04309bbd274fc592db22c4f25c002ee92 100644
--- a/lib/classes/StudipSemTreeViewSimple.php
+++ b/lib/classes/StudipSemTreeViewSimple.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeViewSimple.class.php
+// StudipSemTreeViewSimple.php
 // Class to print out the seminar tree
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/TreeAbstract.php b/lib/classes/TreeAbstract.php
index ccdb6e11760b45195ae863bc354717b6e0e0e991..a1413b3f11b9c413cbe5f731c29459d4c4e9ecd1 100644
--- a/lib/classes/TreeAbstract.php
+++ b/lib/classes/TreeAbstract.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// TreeAbstract.class.php
+// TreeAbstract.php
 // Abstract Base Class to handle in-memory tree structures
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/TreeView.php b/lib/classes/TreeView.php
index 243a9b9e6312ba42b342a6a7fdb4f462a423c127..0bc2810355d86534ee7f7183d8b2ff5a1b084d8a 100644
--- a/lib/classes/TreeView.php
+++ b/lib/classes/TreeView.php
@@ -5,8 +5,8 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// TreeView.class.php
-// Class to print out html represantation of a tree object based on TreeAbstract.class.php
+// TreeView.php
+// Class to print out html represantation of a tree object based on TreeAbstract.php
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
 // Suchi & Berg GmbH <info@data-quest.de>
@@ -26,9 +26,7 @@
 // +---------------------------------------------------------------------------+
 
 /**
-* Class to print out html represantation of a tree object based on TreeAbstract.class.php
-*
-* Class to print out html represantation of a tree object based on TreeAbstract.class.php
+* Class to print out html represantation of a tree object based on TreeAbstract.php
 *
 * @access   public
 * @author   André Noack <noack@data-quest.de>
diff --git a/lib/classes/UserConfig.php b/lib/classes/UserConfig.php
index 4cb1ff6a190b84d8133e5f55d6229c733a770681..413d4c853f371ba07a26538ebfedad82d6fcc070 100644
--- a/lib/classes/UserConfig.php
+++ b/lib/classes/UserConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserConfig.class.php
+ * UserConfig.php
  * provides access to user preferences
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/UserLookup.php b/lib/classes/UserLookup.php
index bdd9fc368c0ad6281122e9e7300df16560775df4..62de8fd4eb8c996e0427c975c84d4a10c593a787 100644
--- a/lib/classes/UserLookup.php
+++ b/lib/classes/UserLookup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserLookup.class.php
+ * UserLookup.php
  *
  * provides an easy way to look up user ids by certain filter criteria
  *
diff --git a/lib/classes/UserManagement.php b/lib/classes/UserManagement.php
index 015e6cd491a8c76c759b8e62c177b92fbc8749b3..4bd47ec1cd1998f76042de0405d3722de8cc405e 100644
--- a/lib/classes/UserManagement.php
+++ b/lib/classes/UserManagement.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter007: TODO
 /**
- * UserManagement.class.php
+ * UserManagement.php
  *
  * Management for the Stud.IP global users
  *
@@ -25,7 +25,7 @@ require_once 'lib/messaging.inc.php';   // remove messages send or recieved by u
 require_once 'lib/object.inc.php';
 
 /**
- * UserManagement.class.php
+ * UserManagement.php
  *
  * Management for the Stud.IP global users
  *
diff --git a/lib/classes/admission/AdmissionAlgorithm.php b/lib/classes/admission/AdmissionAlgorithm.php
index 7e9df92117efd08e1d37f10d51669391452ad2f0..fae10610117aa78c09e72f450583e288a7304600 100644
--- a/lib/classes/admission/AdmissionAlgorithm.php
+++ b/lib/classes/admission/AdmissionAlgorithm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * AdmissionAlgorithm.class.php
+ * AdmissionAlgorithm.php
  * 
  * Abstract class for seminar seat distribution. A concrete algorithm 
  * needs to be implemented.
@@ -32,4 +32,4 @@ abstract class AdmissionAlgorithm
 
 } /* end of class AdmissionAlgorithm */
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/classes/admission/AdmissionPriority.php b/lib/classes/admission/AdmissionPriority.php
index 47e156478c5727dfd62d33482525539de82e654c..22d426e54e8c76f4ba19aba6eea4e4df3cef9a72 100644
--- a/lib/classes/admission/AdmissionPriority.php
+++ b/lib/classes/admission/AdmissionPriority.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * AdmissionPriority.class.php
+ * AdmissionPriority.php
  *
  * This class represents priorities a user has given to a set of courses.
  * No instance is needed, all methods are designed to be called statically.
diff --git a/lib/classes/admission/AdmissionRule.php b/lib/classes/admission/AdmissionRule.php
index fe5e5bbf39a1312fbe18d0637c89fd1ed9ee00fa..2b826e49ac44a6baab46d1b5e46a1a7e06590329 100644
--- a/lib/classes/admission/AdmissionRule.php
+++ b/lib/classes/admission/AdmissionRule.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * AdmissionRule.class.php
+ * AdmissionRule.php
  *
  * An abstract representation of rules for course admission.
  *
diff --git a/lib/classes/admission/AdmissionUserList.php b/lib/classes/admission/AdmissionUserList.php
index 570bc62b697e1fb1e827f814538c927bedc44603..3e5a43099fb081062eabb9affc004e88d2311491 100644
--- a/lib/classes/admission/AdmissionUserList.php
+++ b/lib/classes/admission/AdmissionUserList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * AdmissionUserList.class.php
+ * AdmissionUserList.php
  *
  * Contains users that get different probabilities than others in seat
  * distribution algorithm.
diff --git a/lib/classes/admission/CourseSet.php b/lib/classes/admission/CourseSet.php
index d94bc057a9a0f25d1770dc0b9e2cd32bfcdbe83e..cf876673671a68823e1d822805307cac2b2ab963 100644
--- a/lib/classes/admission/CourseSet.php
+++ b/lib/classes/admission/CourseSet.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * CourseSet.class.php
+ * CourseSet.php
  *
  * Represents groups of Stud.IP courses that have common rules for admission.
  *
diff --git a/lib/classes/admission/RandomAlgorithm.php b/lib/classes/admission/RandomAlgorithm.php
index 54d44d7f8402f46308995c76d28d0cf7cbdaa71c..4666f594d067eed1ba69ab025126349b5f229cc6 100644
--- a/lib/classes/admission/RandomAlgorithm.php
+++ b/lib/classes/admission/RandomAlgorithm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RandomAlgorithm.class.php - Standard seat distribution algorithm
+ * RandomAlgorithm.php - Standard seat distribution algorithm
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/admission/UserFilter.php b/lib/classes/admission/UserFilter.php
index d380ef0c0b52bb4ade5a1c83340f25c39b211dda..692422f53574fd241b4814d93bae9c72de4f055e 100644
--- a/lib/classes/admission/UserFilter.php
+++ b/lib/classes/admission/UserFilter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * UserFilter.class.php
+ * UserFilter.php
  *
  * Conditions for user selection in Stud.IP. A condition is a collection of
  * condition fields, e.g. degree, course of study or semester. Each
diff --git a/lib/classes/admission/UserFilterField.php b/lib/classes/admission/UserFilterField.php
index 9081e9015bda83d91426146d6086f42930d6a72f..4b5132207cf4df1ba7b7ba3fd4278035557f3dda 100644
--- a/lib/classes/admission/UserFilterField.php
+++ b/lib/classes/admission/UserFilterField.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * UserFilterField.class.php
+ * UserFilterField.php
  *
  * A specification of a Stud.IP condition that must be fulfilled. One
  * or more instances of the UserFilterField subclasses make up a
@@ -197,11 +197,10 @@ class UserFilterField
         if (self::$available_filter_fields === null) {
         $fields = [];
         // Load all PHP class files found in the condition field folder.
-        foreach (glob(realpath(dirname(__FILE__).'/userfilter').'/*.class.php') as $file) {
+        foreach (glob(realpath(dirname(__FILE__).'/userfilter').'/*.php') as $file) {
             require_once($file);
             // Try to auto-calculate class name from file name.
-            $className = mb_substr(basename($file), 0,
-                mb_strpos(basename($file), '.class.php'));
+            $className = mb_substr(basename($file), 0, mb_strpos(basename($file), '.php'));
             // Check if class is right.
             if (is_subclass_of($className, 'UserFilterField')) {
                 if ($className::$isParameterized) {
diff --git a/lib/classes/admission/userfilter/DatafieldCondition.php b/lib/classes/admission/userfilter/DatafieldCondition.php
index 966fe8eb9b6a5749479a20c079a7c7772b8cc5f1..1bc93e8b775c873c8033095ac63f218df4bbac7f 100644
--- a/lib/classes/admission/userfilter/DatafieldCondition.php
+++ b/lib/classes/admission/userfilter/DatafieldCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DatafieldCondition.class.php
+ * DatafieldCondition.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/admission/userfilter/DegreeCondition.php b/lib/classes/admission/userfilter/DegreeCondition.php
index 9180e2d39f2383ac39e522aaf77a36978d2f5053..61ce456d0c43a3356c341f8d19dbf2607db483f1 100644
--- a/lib/classes/admission/userfilter/DegreeCondition.php
+++ b/lib/classes/admission/userfilter/DegreeCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DegreeCondition.class.php
+ * DegreeCondition.php
  *
  * All conditions concerning the study degree in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/PermissionCondition.php b/lib/classes/admission/userfilter/PermissionCondition.php
index 4adfdbfb50f804cce288a64bf9241b3915ef2343..fe9458c6f3a84a998f0839ac64972f47b54dfc99 100644
--- a/lib/classes/admission/userfilter/PermissionCondition.php
+++ b/lib/classes/admission/userfilter/PermissionCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PermissionCondition.class.php
+ * PermissionCondition.php
  *
  * All conditions concerning the semester of study in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/SemesterOfStudyCondition.php b/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
index 2c1233a05a55ec552d3cfc21d4b60f712bb407c9..5794f759e1e21cd47975a402037fedac571f03db 100644
--- a/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
+++ b/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SemesterOfStudyCondition.class.php
+ * SemesterOfStudyCondition.php
  *
  * All conditions concerning the semester of study in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/StgteilVersionCondition.php b/lib/classes/admission/userfilter/StgteilVersionCondition.php
index f6348e505877114b94fa3809b07ca2e49a4f5814..ec5c1f3803316bfaaad28d4edb7eba1f5bb23ee4 100644
--- a/lib/classes/admission/userfilter/StgteilVersionCondition.php
+++ b/lib/classes/admission/userfilter/StgteilVersionCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StgteilVersionCondition.class.php
+ * StgteilVersionCondition.php
  *
  * All conditions concerning the Studiengangteil-Versionen in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/SubjectCondition.php b/lib/classes/admission/userfilter/SubjectCondition.php
index ab44d491190f10d04c4a93c8f729cc7d71f0c07a..7aa5f26cc36eca7227168b48e864165ef2849277 100644
--- a/lib/classes/admission/userfilter/SubjectCondition.php
+++ b/lib/classes/admission/userfilter/SubjectCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SubjectCondition.class.php
+ * SubjectCondition.php
  *
  * All conditions concerning the study subject in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/SubjectConditionAny.php b/lib/classes/admission/userfilter/SubjectConditionAny.php
index 107c86ce29eb1366e8769c84234d5edac81c61e2..3a3712ba040d2f782cd9d67ec4956d3c5ee272c3 100644
--- a/lib/classes/admission/userfilter/SubjectConditionAny.php
+++ b/lib/classes/admission/userfilter/SubjectConditionAny.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SubjectConditionAny.class.php
+ * SubjectConditionAny.php
  *
  * All conditions concerning the study subject in Stud.IP can be specified here.
  *
@@ -14,7 +14,7 @@
  * @category    Stud.IP
  */
 
-require_once realpath(__DIR__ . '/..') . '/UserFilterField.class.php';
+require_once realpath(__DIR__ . '/..') . '/UserFilterField.php';
 
 class SubjectConditionAny extends UserFilterField
 {
diff --git a/lib/classes/auth_plugins/StudipAuthAbstract.php b/lib/classes/auth_plugins/StudipAuthAbstract.php
index 36c75df646faa36d368dbfd94c1e1f4dbec64c77..19d5afa73add5820c19b0f86b9433dfffbfd2091 100644
--- a/lib/classes/auth_plugins/StudipAuthAbstract.php
+++ b/lib/classes/auth_plugins/StudipAuthAbstract.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthAbstract.class.php
+// StudipAuthAbstract.php
 // Abstract class, used as a template for authentication plugins
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/auth_plugins/StudipAuthIP.php b/lib/classes/auth_plugins/StudipAuthIP.php
index e0d6afa32155e633c1db10be992b155abef93a53..dd42a287f6152452efa680a199e565388034b792 100644
--- a/lib/classes/auth_plugins/StudipAuthIP.php
+++ b/lib/classes/auth_plugins/StudipAuthIP.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StudipAuthIP.class.php - Stud.IP authentication with user ip
+ * StudipAuthIP.php - Stud.IP authentication with user ip
  * Copyright (c) 2014  Florian Bieringer, Uni Passau
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthLTI.php b/lib/classes/auth_plugins/StudipAuthLTI.php
index 07ab8c378c98af523821b386afb3020f4f4e759d..d5a286334f2be567f8358f12f403338c6a06e52a 100644
--- a/lib/classes/auth_plugins/StudipAuthLTI.php
+++ b/lib/classes/auth_plugins/StudipAuthLTI.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StudipAuthLTI.class.php - Stud.IP authentication against LTI 1.1 consumer
+ * StudipAuthLTI.php - Stud.IP authentication against LTI 1.1 consumer
  * Copyright (c) 2018  Elmar Ludwig
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthLdap.php b/lib/classes/auth_plugins/StudipAuthLdap.php
index 7cb8686002852a6b67fa2f4c49bb5c9760388ff0..6bbd3fd43cee8721d31f258ade0ae773f8c953f9 100644
--- a/lib/classes/auth_plugins/StudipAuthLdap.php
+++ b/lib/classes/auth_plugins/StudipAuthLdap.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthLdap.class.php
+// StudipAuthLdap.php
 // Stud.IP authentication against LDAP Server
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
index 742f0cba4a65177ccd5fb0421a3e50d5b0d7a050..3acb1d8ca3923f9b5cda8decd1e825342ffb6ca5 100644
--- a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
+++ b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
@@ -4,7 +4,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthLdapReadAndBind.class.php
+// StudipAuthLdapReadAndBind.php
 // Stud.IP authentication against LDAP Server using read-only account and
 // user bind
 //
diff --git a/lib/classes/auth_plugins/StudipAuthOIDC.php b/lib/classes/auth_plugins/StudipAuthOIDC.php
index adfe9c9a4b092fa848b2fb7bdce4ecfae5e8331f..b26c17b0f941f101a08d198e65ea0922cbae6055 100644
--- a/lib/classes/auth_plugins/StudipAuthOIDC.php
+++ b/lib/classes/auth_plugins/StudipAuthOIDC.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StudipAuthOpenID.class.php - Stud.IP authentication using OpenID Connect
+ * StudipAuthOpenID.php - Stud.IP authentication using OpenID Connect
  * Copyright (c) 2021  André Noack <noack@data-quest.de>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthSSO.php b/lib/classes/auth_plugins/StudipAuthSSO.php
index 752fa59a1b45511d14ddf5c47f3bde2b7e5ba8fe..dd6af11387bb4b3c54ed44effa44b72cc72c07d1 100644
--- a/lib/classes/auth_plugins/StudipAuthSSO.php
+++ b/lib/classes/auth_plugins/StudipAuthSSO.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /*
- * StudipAuthSSO.class.php - abstract base class for SSO auth plugins
+ * StudipAuthSSO.php - abstract base class for SSO auth plugins
  * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthShib.php b/lib/classes/auth_plugins/StudipAuthShib.php
index 3eedc65c7609293358d572568d89a720af191914..135b3f6f878aca7285f72df6c4805e998ed84eaf 100644
--- a/lib/classes/auth_plugins/StudipAuthShib.php
+++ b/lib/classes/auth_plugins/StudipAuthShib.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /*
- * StudipAuthShib.class.php - Stud.IP authentication against Shibboleth server
+ * StudipAuthShib.php - Stud.IP authentication against Shibboleth server
  * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthStandard.php b/lib/classes/auth_plugins/StudipAuthStandard.php
index 5bb3e65f0dbb66adb6e404427da974d022f09389..927a13cb9a6e3e069fd38f0d6860e55b3431b387 100644
--- a/lib/classes/auth_plugins/StudipAuthStandard.php
+++ b/lib/classes/auth_plugins/StudipAuthStandard.php
@@ -4,7 +4,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthStandard.class.php
+// StudipAuthStandard.php
 // Basic Stud.IP authentication, using the Stud.IP database
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/cache/Exception.php b/lib/classes/cache/Exception.php
index 64ee364087391da65ebf2f78450d6ba76abf4ddd..061d09019a226155c2482c38f44d9d377f69d4cb 100644
--- a/lib/classes/cache/Exception.php
+++ b/lib/classes/cache/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * CacheException.class.php
+ * CacheException.php
  * This file is part of Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/cache/InvalidCacheArgumentException.php b/lib/classes/cache/InvalidCacheArgumentException.php
index e85c6b2c1380e6633aeaa2a599a29e35d0e834bb..a201cad983ebc23c776264a6b72765b2e24e22ce 100644
--- a/lib/classes/cache/InvalidCacheArgumentException.php
+++ b/lib/classes/cache/InvalidCacheArgumentException.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * CacheException.class.php
+ * CacheException.php
  * This file is part of Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/cache/Item.php b/lib/classes/cache/Item.php
index 4e83d4ddcebf5e43550c428f7c4e2c3efcb84a97..99a6df81bf642156d71b4d09277b77b8aadd741f 100644
--- a/lib/classes/cache/Item.php
+++ b/lib/classes/cache/Item.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Item.class.php
+ * Item.php
  * This file is part of Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/calendar/ICalendarExport.php b/lib/classes/calendar/ICalendarExport.php
index 00147efcf6e62089658d82bd400aecfe1f553c07..d8d1af7d8ce9936b32f31dedb19d2cf6d9731eac 100644
--- a/lib/classes/calendar/ICalendarExport.php
+++ b/lib/classes/calendar/ICalendarExport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ICalendarExport.class.php
+ * ICalendarExport.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
index e79e1bde1dea6570ea00b272269aeae4d9c1abba..c651714cf19cc516cc25412c59c28bcda65e86fc 100644
--- a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
+++ b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
@@ -13,7 +13,7 @@
  * @category    Stud.IP
  */
 
-require_once dirname(__FILE__) . '/../StudipLvgruppeSelection.class.php';
+require_once dirname(__FILE__) . '/../StudipLvgruppeSelection.php';
 
 class LVGroupsWizardStep implements CourseWizardStep
 {
diff --git a/lib/classes/exportdocument/ExportPDF.php b/lib/classes/exportdocument/ExportPDF.php
index 915cfdeaab8a5368fc00879f3aa295cdc8d645f8..f676c4516c84977174519791f7718cc7454b0027 100644
--- a/lib/classes/exportdocument/ExportPDF.php
+++ b/lib/classes/exportdocument/ExportPDF.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * ExportPDF.class.php - create and export or save a pdf with simple HTML-Data
+ * ExportPDF.php - create and export or save a pdf with simple HTML-Data
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/searchtypes/MyCoursesSearch.php b/lib/classes/searchtypes/MyCoursesSearch.php
index 64bee64cb7e0545592c2f222165d9dad1bb493ca..1bdb25086bee29cd51dff49b52c7cd9d8c703d55 100644
--- a/lib/classes/searchtypes/MyCoursesSearch.php
+++ b/lib/classes/searchtypes/MyCoursesSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MyCoursesSearch.class.php
+ * MyCoursesSearch.php
  * Search only in own courses.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/searchtypes/PermissionSearch.php b/lib/classes/searchtypes/PermissionSearch.php
index cc4ce3ebafec07296ab383d7a82bcf05ac78212f..3f862716d59a71984d112358b7b2a41a6118adef 100644
--- a/lib/classes/searchtypes/PermissionSearch.php
+++ b/lib/classes/searchtypes/PermissionSearch.php
@@ -12,7 +12,7 @@
 
 /**
  * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search for people with a given
+ * (lib/classes/QuickSearch.php). You can search for people with a given
  * Stud.IP permission level, either globally or at an institute.
  *
  * @author Thomas Hackl
diff --git a/lib/classes/searchtypes/ResourceSearch.php b/lib/classes/searchtypes/ResourceSearch.php
index 24038a84b4e3e9fa673fc6f98d2ae0fe95f64a07..f664bebcd70a2c2a518c00a31acc1122a426f7af 100644
--- a/lib/classes/searchtypes/ResourceSearch.php
+++ b/lib/classes/searchtypes/ResourceSearch.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceSearch.class.php - A search type for resources.
+ * ResourceSearch.php - A search type for resources.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/searchtypes/RoomSearch.php b/lib/classes/searchtypes/RoomSearch.php
index 002712e3c3172f190cfd1f6fa3a5cc323f2f98b4..877c2cb13eb3f353b97e5fa8fd75d909a07512f4 100644
--- a/lib/classes/searchtypes/RoomSearch.php
+++ b/lib/classes/searchtypes/RoomSearch.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RoomSearch.class.php - A search type for rooms.
+ * RoomSearch.php - A search type for rooms.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/searchtypes/SQLSearch.php b/lib/classes/searchtypes/SQLSearch.php
index 86aff6dcbf0c8edd16452199d5a3d980818c5176..de4efa3aa45e02f12fd2fe229e08f86955bd1df8 100644
--- a/lib/classes/searchtypes/SQLSearch.php
+++ b/lib/classes/searchtypes/SQLSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * SQLSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ * SQLSearch.php - Class of type SearchType used for searches with QuickSearch
  *
  * Long description for file (if any)...
  *
@@ -17,7 +17,7 @@
 
 /**
  * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
+ * (lib/classes/QuickSearch.php). You can search with a sql-syntax in the
  * database. You just need to give in a query like for a PDB-prepare statement
  * and at least the variable ":input" in the query (the :input will be replaced
  * with the input of the QuickSearch userinput.
diff --git a/lib/classes/searchtypes/SearchType.php b/lib/classes/searchtypes/SearchType.php
index d46d57e6af3e6e2272fbcc83620e309ba0c9a80a..b4f9b685c17d5f55c26f78123312d6e8687336b5 100644
--- a/lib/classes/searchtypes/SearchType.php
+++ b/lib/classes/searchtypes/SearchType.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * SQLSearch.class.php - A class-structure for alle search-objects in Stud.IP.
+ * SQLSearch.php - A class-structure for alle search-objects in Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -104,4 +104,3 @@ abstract class SearchType
      */
     abstract public function includePath();
 }
-
diff --git a/lib/classes/searchtypes/SeminarSearch.php b/lib/classes/searchtypes/SeminarSearch.php
index e4902289314b95c11c5322302efa2a767612b421..fd7bf8a090e4a99463978129bc122a60e949f535 100644
--- a/lib/classes/searchtypes/SeminarSearch.php
+++ b/lib/classes/searchtypes/SeminarSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * SeminarSearch.class.php
+ * SeminarSearch.php
  * class to adapt StudipSemSearch to Quicksearch
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/searchtypes/StandardSearch.php b/lib/classes/searchtypes/StandardSearch.php
index 837a849c86689d36440da202d2c84581a73f923d..a3f0f3b547429a157ce6ffe9037024f359530994 100644
--- a/lib/classes/searchtypes/StandardSearch.php
+++ b/lib/classes/searchtypes/StandardSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * StandardSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ * StandardSearch.php - Class of type SearchType used for searches with QuickSearch
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,7 +15,7 @@
 
 /**
  * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
+ * (lib/classes/QuickSearch.php). You can search with a sql-syntax in the
  * database. You just need to give in a query like for a PDB-prepare statement
  * and at least the variable ":input" in the query (the :input will be replaced
  * with the input of the QuickSearch userinput.
diff --git a/lib/classes/searchtypes/TreeSearch.php b/lib/classes/searchtypes/TreeSearch.php
index 2fecf60e0cd9c81493b36424d47c12c8aed91fa0..73d423935aae2c9a5037ba4d419bba5557e35970 100644
--- a/lib/classes/searchtypes/TreeSearch.php
+++ b/lib/classes/searchtypes/TreeSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * TreeSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ * TreeSearch.php - Class of type SearchType used for searches with QuickSearch
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/cronjobs/check_admission.php b/lib/cronjobs/check_admission.php
index dfd493cfbb8c1c52b1c3ff050b96566f21d60677..1be4c093f77a33c54b8c8ea77f48ef09b7c69695 100644
--- a/lib/cronjobs/check_admission.php
+++ b/lib/cronjobs/check_admission.php
@@ -4,7 +4,7 @@ use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 
 /**
-* check_admission.class.php
+* check_admission.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
@@ -49,7 +49,7 @@ class CheckAdmissionJob extends CronJob
 
     public function setUp()
     {
-        require_once 'lib/classes/admission/CourseSet.class.php';
+        require_once 'lib/classes/admission/CourseSet.php';
         if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
             throw new Exception('To use check_admission job you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
         }
diff --git a/lib/cronjobs/cleanup_log.php b/lib/cronjobs/cleanup_log.php
index 378a6ecedab8fa6ff01a02c1f8a643063343791b..e88f8036b6489efe9fe5fd250d9ffca1c96e98e4 100644
--- a/lib/cronjobs/cleanup_log.php
+++ b/lib/cronjobs/cleanup_log.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// cleanup_log.class.php
+// cleanup_log.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class CleanupLogJob extends CronJob
 {
diff --git a/lib/cronjobs/garbage_collector.php b/lib/cronjobs/garbage_collector.php
index bab44b287e7989c565dc33728a2c6569318644c9..eba57fca69daa3f6f89503cda4716aceebedfb58 100644
--- a/lib/cronjobs/garbage_collector.php
+++ b/lib/cronjobs/garbage_collector.php
@@ -1,12 +1,12 @@
 <?php
 /**
-* garbage_collector.class.php
+* garbage_collector.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
 * @since  2.4
 */
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class GarbageCollectorJob extends CronJob
 {
diff --git a/lib/cronjobs/purge_cache.php b/lib/cronjobs/purge_cache.php
index d2e3697db8d464cb362fc5c786e866c90e45f1e8..2e253e1e3b5f8fea7ba9194dc1b8e0dd29d2336f 100644
--- a/lib/cronjobs/purge_cache.php
+++ b/lib/cronjobs/purge_cache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * purge_cache.class.php - Purges the file cache.
+ * purge_cache.php - Purges the file cache.
  * 
  * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
  * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// purge_cache.class.php
+// purge_cache.php
 // 
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class PurgeCacheJob extends CronJob
 {
@@ -70,7 +70,7 @@ class PurgeCacheJob extends CronJob
      */
     public function setUp()
     {
-        require_once 'lib/classes/cache/FileCache.class.php';
+        require_once 'lib/classes/cache/FileCache.php';
     }
 
     /**
diff --git a/lib/cronjobs/remind_oer_upload.php b/lib/cronjobs/remind_oer_upload.php
index a1a8ee1984cbb7ec12817091d5030101217f9b16..528d789e0f90a782538932544a1157241ae06110 100644
--- a/lib/cronjobs/remind_oer_upload.php
+++ b/lib/cronjobs/remind_oer_upload.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * remind_oer_upload.class.php - Sends reminder emails for uploading files to OER Campus.
+ * remind_oer_upload.php - Sends reminder emails for uploading files to OER Campus.
  *
  * @author Michaela Brückner <brueckner@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
  * @access public
  * @since  5.2
  */
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class RemindOerUpload extends CronJob
 {
diff --git a/lib/cronjobs/send_mail_queue.php b/lib/cronjobs/send_mail_queue.php
index 8f729187ea68d148454c22e9d6ef322e9a5256ca..f9cdd941c5186c55da77cb23d65285d4f7bb184a 100644
--- a/lib/cronjobs/send_mail_queue.php
+++ b/lib/cronjobs/send_mail_queue.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* send_mail_queue.class.php
+* send_mail_queue.php
 *
 * @author Rasmus Fuhse <fuhse@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
diff --git a/lib/cronjobs/session_gc.php b/lib/cronjobs/session_gc.php
index 4289a29ea08a0cf024d8f7761e618a7ce60216c4..54763ee0c4fe036f6b50d74675ec0a2e0dd3ecae 100644
--- a/lib/cronjobs/session_gc.php
+++ b/lib/cronjobs/session_gc.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* session_gc.class.php
+* session_gc.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
diff --git a/lib/dbviews/range_tree.view.php b/lib/dbviews/range_tree.view.php
index 8d3af86fdb49794a7ac155e1fd91e663aae27e91..913330dcf7690ff5c8bdc93ea07874f6303c696a 100644
--- a/lib/dbviews/range_tree.view.php
+++ b/lib/dbviews/range_tree.view.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// range_tree.view.class.php
+// range_tree.view.php
 // Database views used with "range_tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/dbviews/sem_tree.view.php b/lib/dbviews/sem_tree.view.php
index 008ee933b0ca00f03b166c56fd80c12d056e2ab4..8980e718c116a94b08ffe358cae1d4fa36e288ad 100644
--- a/lib/dbviews/sem_tree.view.php
+++ b/lib/dbviews/sem_tree.view.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// sem_tree.view.class.php
+// sem_tree.view.php
 // Database views used with "sem_tree"
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/elearning/ConnectedCMS.php b/lib/elearning/ConnectedCMS.php
index 3dd3bfba2620c14ecc931c62ec749994f895b43f..f5617e83264a8c8bfa3d5d0e4ca722c574fb912b 100644
--- a/lib/elearning/ConnectedCMS.php
+++ b/lib/elearning/ConnectedCMS.php
@@ -100,15 +100,15 @@ class ConnectedCMS
     public function initSubclasses()
     {
         if ($this->auth_necessary) {
-            require_once $this->CLASS_PREFIX . "ConnectedUser.class.php";
+            require_once $this->CLASS_PREFIX . "ConnectedUser.php";
             $classname = $this->CLASS_PREFIX . "ConnectedUser";
             $this->user = new $classname($this->cms_type);
 
-            require_once $this->CLASS_PREFIX  . "ConnectedPermissions.class.php";
+            require_once $this->CLASS_PREFIX  . "ConnectedPermissions.php";
             $classname = $this->CLASS_PREFIX  . "ConnectedPermissions";
             $this->permissions = new $classname($this->cms_type);
         }
-        require_once $this->CLASS_PREFIX . "ConnectedLink.class.php";
+        require_once $this->CLASS_PREFIX . "ConnectedLink.php";
         $classname = $this->CLASS_PREFIX . "ConnectedLink";
         $this->link = new $classname($this->cms_type);
     }
@@ -203,14 +203,14 @@ class ConnectedCMS
         $el_path = $GLOBALS['STUDIP_BASE_PATH'] . '/lib/elearning';
         // check if needed classes exist
         $files = [
-            'class_link'    => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.class.php",
-            'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.class.php",
-            'class_cms'     => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.class.php",
+            'class_link'    => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.php",
+            'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.php",
+            'class_cms'     => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.php",
         ];
 
         if ($this->auth_necessary) {
-            $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.class.php";
-            $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.class.php";
+            $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.php";
+            $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.php";
         }
 
         $errors = 0;
@@ -281,7 +281,7 @@ class ConnectedCMS
         global $current_module;
         $current_module = $data["ref_id"];
 
-        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
+        require_once($this->CLASS_PREFIX . "ContentModule.php");
         $classname = $this->CLASS_PREFIX  . "ContentModule";
 
         $this->content_module[$current_module] = new  $classname("", $data["type"], $this->cms_type);
@@ -305,7 +305,7 @@ class ConnectedCMS
         global $current_module;
         $current_module = $module_id;
 
-        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
+        require_once($this->CLASS_PREFIX . "ContentModule.php");
         $classname = $this->CLASS_PREFIX  . "ContentModule";
 
         if ($is_connected == false)
diff --git a/lib/elearning/ELearningUtils.php b/lib/elearning/ELearningUtils.php
index 33fb4a24a99205174d4d82de22bd320c4750702d..806cff911686652ed77f021e5d93a22430123cef 100644
--- a/lib/elearning/ELearningUtils.php
+++ b/lib/elearning/ELearningUtils.php
@@ -26,7 +26,7 @@ class ELearningUtils
         global $connected_cms, $ELEARNING_INTERFACE_MODULES;
 
         if (!isset($connected_cms[$cms]) || !is_object($connected_cms[$cms])) {
-            require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.class.php";
+            require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.php";
             $classname = "{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS";
             $connected_cms[$cms] = new $classname($cms);
             $connected_cms[$cms]->initSubclasses();
diff --git a/lib/elearning/Ilias3ConnectedCMS.php b/lib/elearning/Ilias3ConnectedCMS.php
index 3e428ff2b729360723407f6e22a7152ef0e9e90e..759880afc92255437983275c65fd71f50eeb48ac 100644
--- a/lib/elearning/Ilias3ConnectedCMS.php
+++ b/lib/elearning/Ilias3ConnectedCMS.php
@@ -44,7 +44,7 @@ class Ilias3ConnectedCMS extends ConnectedCMS
 
         parent::__construct($cms);
 
-        require_once($this->CLASS_PREFIX . "Soap.class.php");
+        require_once($this->CLASS_PREFIX . "Soap.php");
         $classname = $this->CLASS_PREFIX . "Soap";
         $this->soap_client = new $classname($this->cms_type);
         $this->soap_client->setCachingStatus(true);
diff --git a/lib/elearning/PmWikiConnectedCMS.php b/lib/elearning/PmWikiConnectedCMS.php
index 7de0a788e73a5acad1a06677e933db463b38751f..d89012699b60872da122b230da203bcdeeaeef1f 100644
--- a/lib/elearning/PmWikiConnectedCMS.php
+++ b/lib/elearning/PmWikiConnectedCMS.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 
 /*
- * PmWikiConnectedCMS.class.php - Provides search capabilities
+ * PmWikiConnectedCMS.php - Provides search capabilities
  * to search WikiFarm
  *
  * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
diff --git a/lib/elearning/PmWikiConnectedLink.php b/lib/elearning/PmWikiConnectedLink.php
index 8ed741660fd122294400f600c90ee568dc5c9139..973c272d5757b6deee8d675272c498d9e60f74d4 100644
--- a/lib/elearning/PmWikiConnectedLink.php
+++ b/lib/elearning/PmWikiConnectedLink.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 
 /*
- * PmWikiConnectedLink.class.php - Provides links to PmWiki Modules
+ * PmWikiConnectedLink.php - Provides links to PmWiki Modules
  *
  * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
  *
diff --git a/lib/elearning/PmWikiContentModule.php b/lib/elearning/PmWikiContentModule.php
index 06533dda93f730136c5853a5c707a29044b4fdb4..fb3cccd971510411793a1bbef514e74f31ab7c10 100644
--- a/lib/elearning/PmWikiContentModule.php
+++ b/lib/elearning/PmWikiContentModule.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 
 /*
- * PmWikiContentModule.class.php - Provides access PmWiki Modules
+ * PmWikiContentModule.php - Provides access PmWiki Modules
  *
  * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
  *
diff --git a/lib/exceptions/ClipboardException.php b/lib/exceptions/ClipboardException.php
index 676da9390341b0618599e8fa15c4b03cfdffbad4..1c8017529407766ff914821b4c193d715015861c 100644
--- a/lib/exceptions/ClipboardException.php
+++ b/lib/exceptions/ClipboardException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ClipboardException.class.php
+ * ClipboardException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/StudipException.php b/lib/exceptions/StudipException.php
index e9bbf3d91403811fab3126879dd6f9d97cccda23..369ba6fce745d96e8644d979b41309d7cefe951b 100644
--- a/lib/exceptions/StudipException.php
+++ b/lib/exceptions/StudipException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * StudipException.class.php
+ * StudipException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/GlobalResourceLockException.php b/lib/exceptions/resources/GlobalResourceLockException.php
index 165843feebea43b0b5eccd5f852a90b6b1fa124c..d12c2d8a803492a981c10449df3350efa459ca14 100644
--- a/lib/exceptions/resources/GlobalResourceLockException.php
+++ b/lib/exceptions/resources/GlobalResourceLockException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GlobalResourceLockException.class.php
+ * GlobalResourceLockException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/GlobalResourceLockOverlapException.php b/lib/exceptions/resources/GlobalResourceLockOverlapException.php
index 6b05cf5e015cd9cf5f62686a63da63526f8088d7..b73a89786e3b3aa39ab4dfe73d7d7b7bea78e47d 100644
--- a/lib/exceptions/resources/GlobalResourceLockOverlapException.php
+++ b/lib/exceptions/resources/GlobalResourceLockOverlapException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GlobalResourceLockOverlapException.class.php
+ * GlobalResourceLockOverlapException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceCategoryException.php b/lib/exceptions/resources/InvalidResourceCategoryException.php
index df4d36cc7ee5b746a21e9955d087dc7caaa2a910..f2b1fe985dabd1688f5c4f1b262d58d8aa9e4196 100644
--- a/lib/exceptions/resources/InvalidResourceCategoryException.php
+++ b/lib/exceptions/resources/InvalidResourceCategoryException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceCategoryException.class.php
+ * InvalidResourceCategoryException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceClassException.php b/lib/exceptions/resources/InvalidResourceClassException.php
index 8420a83982a09e2044646f2614528ec9ff63d2db..2c1f033dcf3f9070cac04814c74bed41d1494249 100644
--- a/lib/exceptions/resources/InvalidResourceClassException.php
+++ b/lib/exceptions/resources/InvalidResourceClassException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceClassException.class.php
+ * InvalidResourceClassException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceException.php b/lib/exceptions/resources/InvalidResourceException.php
index e9850b80bdc137cbeffcf20f4c569bd0e21be5aa..de61d2408c4a2c981daff5621415d4c7f15965e2 100644
--- a/lib/exceptions/resources/InvalidResourceException.php
+++ b/lib/exceptions/resources/InvalidResourceException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceException.class.php
+ * InvalidResourceException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceRequestException.php b/lib/exceptions/resources/InvalidResourceRequestException.php
index 8ec9dab1566de7c537debca86e76796413ccba4a..8ee48b39520c3c2f999e7ad1548c0c86eabca22b 100644
--- a/lib/exceptions/resources/InvalidResourceRequestException.php
+++ b/lib/exceptions/resources/InvalidResourceRequestException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceRequestException.class.php
+ * InvalidResourceRequestException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceBookingException.php b/lib/exceptions/resources/ResourceBookingException.php
index c1db11c0c6c3fbe76911f139ac09e2b2d4615d38..3dcf4834b8a01c8a6ca3213ad9efd77920d0255c 100644
--- a/lib/exceptions/resources/ResourceBookingException.php
+++ b/lib/exceptions/resources/ResourceBookingException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingException.class.php
+ * ResourceBookingException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceBookingOverlapException.php b/lib/exceptions/resources/ResourceBookingOverlapException.php
index f59cc39179f5638eb0aba1f7b9f4b26187c5fa1d..697cfc5746c974db6a00f4883893ac2e4ed20dba 100644
--- a/lib/exceptions/resources/ResourceBookingOverlapException.php
+++ b/lib/exceptions/resources/ResourceBookingOverlapException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingOverlapException.class.php
+ * ResourceBookingOverlapException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceBookingRangeException.php b/lib/exceptions/resources/ResourceBookingRangeException.php
index 50e71449c174f76810831cd04bc465a8cf2192d2..48e04a266215663743bb20e8e225b993b4dd8247 100644
--- a/lib/exceptions/resources/ResourceBookingRangeException.php
+++ b/lib/exceptions/resources/ResourceBookingRangeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingRangeException.class.php
+ * ResourceBookingRangeException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceException.php b/lib/exceptions/resources/ResourceException.php
index 686cc33cecca28ae1008cfa0f770864f961256be..3f7a5adeea99bc956148713ba3a4e198f89d3bda 100644
--- a/lib/exceptions/resources/ResourceException.php
+++ b/lib/exceptions/resources/ResourceException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceException.class.php
+ * ResourceException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceNoTimeRangeException.php b/lib/exceptions/resources/ResourceNoTimeRangeException.php
index 891b583b1036fe779a978850fb5df593b0eedacc..f1c5f2c51b9ef7568981bb4e39325a812c8ba7c4 100644
--- a/lib/exceptions/resources/ResourceNoTimeRangeException.php
+++ b/lib/exceptions/resources/ResourceNoTimeRangeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceNoTimeRangeException.class.php
+ * ResourceNoTimeRangeException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePermissionException.php b/lib/exceptions/resources/ResourcePermissionException.php
index 3a0c919be790556c8b48b8cf546fa8e29068027f..add73858a560d82def3c1e62b023f5f406455f9e 100644
--- a/lib/exceptions/resources/ResourcePermissionException.php
+++ b/lib/exceptions/resources/ResourcePermissionException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePermissionException.class.php
+ * ResourcePermissionException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePropertyDefinitionException.php b/lib/exceptions/resources/ResourcePropertyDefinitionException.php
index 963ca64277beff645d18f1cb09548dd3ac36c21c..5b96dd9c66a3a32f3da09e73da0da8aed95f640f 100644
--- a/lib/exceptions/resources/ResourcePropertyDefinitionException.php
+++ b/lib/exceptions/resources/ResourcePropertyDefinitionException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyDefinitionException.class.php
+ * ResourcePropertyDefinitionException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePropertyException.php b/lib/exceptions/resources/ResourcePropertyException.php
index 83f871f7467e3c63fe04611d7c17499b906be855..917c3b0753ecfe93912d6d9b73e4c6e49e073ef4 100644
--- a/lib/exceptions/resources/ResourcePropertyException.php
+++ b/lib/exceptions/resources/ResourcePropertyException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyException.class.php
+ * ResourcePropertyException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePropertyStateException.php b/lib/exceptions/resources/ResourcePropertyStateException.php
index 1880265d526abbb0bf3c1fff27a327891e706170..b93d6da15777a1b5da749f89917c59360e9b2edf 100644
--- a/lib/exceptions/resources/ResourcePropertyStateException.php
+++ b/lib/exceptions/resources/ResourcePropertyStateException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyStateException.class.php
+ * ResourcePropertyStateException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceRequestException.php b/lib/exceptions/resources/ResourceRequestException.php
index 1e8d07130ba9c6577d6f77ad310f9d2678e4b149..ffd238cde7bb7fb80a51e78b3ff610b24e48e121 100644
--- a/lib/exceptions/resources/ResourceRequestException.php
+++ b/lib/exceptions/resources/ResourceRequestException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequestException.class.php
+ * ResourceRequestException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceUnavailableException.php b/lib/exceptions/resources/ResourceUnavailableException.php
index b335d1431305d51a1b0c70cd419d7a52b18e4cd5..86f33c7a9e0422c2f24b3df88d871291a235697c 100644
--- a/lib/exceptions/resources/ResourceUnavailableException.php
+++ b/lib/exceptions/resources/ResourceUnavailableException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceUnavailableException.class.php
+ * ResourceUnavailableException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceUnlockableException.php b/lib/exceptions/resources/ResourceUnlockableException.php
index 11bc92bd2c4285b2a832f6b9819e983a19c467f9..968729f6ad82e7b971510fa827f4a089dba0b337 100644
--- a/lib/exceptions/resources/ResourceUnlockableException.php
+++ b/lib/exceptions/resources/ResourceUnlockableException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceUnlockableException.class.php
+ * ResourceUnlockableException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/SeparableRoomException.php b/lib/exceptions/resources/SeparableRoomException.php
index 78c9912649892fd884b301545384b34786a517da..91a8c10a3d5ec03d49a002d6c3908dddcd47bbaf 100644
--- a/lib/exceptions/resources/SeparableRoomException.php
+++ b/lib/exceptions/resources/SeparableRoomException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * SeparableRoomException.class.php
+ * SeparableRoomException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/filesystem/FileArchiveManager.php b/lib/filesystem/FileArchiveManager.php
index 704bb44c2830314daa27a06b9d787477e50c1fb6..aded83c56a4e7b9342fd0868d084ce0d07fe0200 100644
--- a/lib/filesystem/FileArchiveManager.php
+++ b/lib/filesystem/FileArchiveManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * FileArchiveManager.class.php
+ * FileArchiveManager.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/filesystem/HomeworkFolder.php b/lib/filesystem/HomeworkFolder.php
index fb93ef8147ce8079ecd7324d68c75074940255bd..f46b4a0673d60b3dabc2642bda0fb2b593cd976a 100644
--- a/lib/filesystem/HomeworkFolder.php
+++ b/lib/filesystem/HomeworkFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * HomeworkFolder.class.php
+ * HomeworkFolder.php
  *
  * This is a FolderType implementation for homework folders.
  *
diff --git a/lib/filesystem/InboxFolder.php b/lib/filesystem/InboxFolder.php
index 428bea53399faf64bc50880c9c946a97a05d826f..d692158b56d970482ee21eb29cb412a3518a57f8 100644
--- a/lib/filesystem/InboxFolder.php
+++ b/lib/filesystem/InboxFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InboxFolder.class.php
+ * InboxFolder.php
  *
  * This is a FolderType implementation for file attachments of messages
  * that were received by a user. It is a read-only folder.
diff --git a/lib/filesystem/InboxOutboxFolder.php b/lib/filesystem/InboxOutboxFolder.php
index 6a8f2fd1581237ac45efd09f4f4756955a82d0ed..33ba6d2eac2ec9cd005b21e91978dacad59de20b 100644
--- a/lib/filesystem/InboxOutboxFolder.php
+++ b/lib/filesystem/InboxOutboxFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InboxOutboxFolder.class.php
+ * InboxOutboxFolder.php
  *
  * This is a common FolderType implementation for inbox and outbox folders.
  * It it not meant to be used directly! Instead use the InboxFolder and
diff --git a/lib/filesystem/MessageFolder.php b/lib/filesystem/MessageFolder.php
index 2e5c3afbc25566cbe3ad62ed4a4479ab73ec8301..2dfef0c0b9971c70390efcbd22f2dce0a2212988 100644
--- a/lib/filesystem/MessageFolder.php
+++ b/lib/filesystem/MessageFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MessageFolder.class.php
+ * MessageFolder.php
  *
  * This is a FolderType implementation for message folders.
  * A message folder contains the attachments of a Stud.IP message.
diff --git a/lib/filesystem/OutboxFolder.php b/lib/filesystem/OutboxFolder.php
index 22170d5e2dc1f0df4dc6f6d83a83409ef944ac7f..548725882c29f2a3839107783b00300195fc5659 100644
--- a/lib/filesystem/OutboxFolder.php
+++ b/lib/filesystem/OutboxFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * OutboxFolder.class.php
+ * OutboxFolder.php
  *
  * This is a FolderType implementation for file attachments of messages
  * that were sent by a user. It is a read-only folder.
diff --git a/lib/models/AdmissionApplication.php b/lib/models/AdmissionApplication.php
index 02514ec818491a505a76a8f7084e202a589a6088..7e8c3f5628617740b592fef05f069fba723463f2 100644
--- a/lib/models/AdmissionApplication.php
+++ b/lib/models/AdmissionApplication.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * AdmissionApplication.class.php
+ * AdmissionApplication.php
  * model class for table admission_seminar_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/ArchivedCourse.php b/lib/models/ArchivedCourse.php
index 81879af2bf6f824c3e3cf280ba1237af159b1824..f3b2de8fcfc65da41884156a9df865097d8b42af 100644
--- a/lib/models/ArchivedCourse.php
+++ b/lib/models/ArchivedCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ArchivedCourse.class.php
+ * ArchivedCourse.php
  * model class for table archiv
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/ArchivedCourseMember.php b/lib/models/ArchivedCourseMember.php
index 1febd35407092521cf48bdb8418c57a9606ab0b6..e54de91c2aeb0008de8b8e9d5fe7690781fe487c 100644
--- a/lib/models/ArchivedCourseMember.php
+++ b/lib/models/ArchivedCourseMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ArchivedCourseMember.class.php
+ * ArchivedCourseMember.php
  * model class for table seminar_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/AuthUserMd5.php b/lib/models/AuthUserMd5.php
index 48e27f8462aff599efec1e8fe35c68ef07449b1b..d8b7c53ef365103f3832ca3f8b4500d726795cc4 100644
--- a/lib/models/AuthUserMd5.php
+++ b/lib/models/AuthUserMd5.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * AuthUserMd5.class.php
+ * AuthUserMd5.php
  * model class for table auth_user_md5
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/BannerRoles.php b/lib/models/BannerRoles.php
index d1c29865317b16edc029476abd39c17dba7c8b38..a460986f861accd0c459c46ae339aa6efe5d02e6 100644
--- a/lib/models/BannerRoles.php
+++ b/lib/models/BannerRoles.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * BannerRoles.class.php - model class for the banner roles
+ * BannerRoles.php - model class for the banner roles
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/Clipboard.php b/lib/models/Clipboard.php
index cd8fe89a994e20023b458171e45a22c0dfd87c06..01282cc135e11aa5f957bfc1b486ae85dcd07b93 100644
--- a/lib/models/Clipboard.php
+++ b/lib/models/Clipboard.php
@@ -2,7 +2,7 @@
 
 
 /**
- * Clipboard.class.php - model class for a clipboard (Merkzettel)
+ * Clipboard.php - model class for a clipboard (Merkzettel)
  *
  * The Clipboard class extends the wish list functionality of the clipboard
  * in the old literature management to allow it to be used in other areas of the
diff --git a/lib/models/ClipboardItem.php b/lib/models/ClipboardItem.php
index 888250f16e3c8e85490b73dbcbea503e370764ec..a19eeafcce9e05f5004cd8655a88a05fa5e016de 100644
--- a/lib/models/ClipboardItem.php
+++ b/lib/models/ClipboardItem.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ClipboardItem.class.php - model class for clipboard items
+ * ClipboardItem.php - model class for clipboard items
  * (Merkzettel-Einträge)
  *
  * The ClipboardItem class holds single items of a clipboard.
diff --git a/lib/models/ColourValue.php b/lib/models/ColourValue.php
index 6ae05ad2706ac64234f1aff126739829a1530012..486de4567951b09d04ff87ff23c65b14e1075061 100644
--- a/lib/models/ColourValue.php
+++ b/lib/models/ColourValue.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ColorValue.class.php
+ * ColorValue.php
  * model class for table color_values
  *
  * Objects of this class holds a colour's name (its purpose)
diff --git a/lib/models/ConfigEntry.php b/lib/models/ConfigEntry.php
index 5e06da8a8ab5cb4052445c46c8b9fc1917c28d4b..dd0efa41272d3f0cede246aa0e9fb8a72b29cfcf 100644
--- a/lib/models/ConfigEntry.php
+++ b/lib/models/ConfigEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ConfigEntry.class.php
+ * ConfigEntry.php
  * model class for table user_config
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/Contact.php b/lib/models/Contact.php
index 16bff26611cfec7a78f95821450374183c54593e..bea5b95cc5de60a4612c2724a1536570f1f02815 100644
--- a/lib/models/Contact.php
+++ b/lib/models/Contact.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Contact.class.php - model class for table contact
+ * Contact.php - model class for table contact
  *
  * @author      <mlunzena@uos.de>
  * @license GPL 2 or later
diff --git a/lib/models/ContentTermsOfUse.php b/lib/models/ContentTermsOfUse.php
index fb2e592cf686f45e8af64f53d106b7414fa826c3..1982dd6c56ab98efb7a286d84ab27accb0c3a455 100644
--- a/lib/models/ContentTermsOfUse.php
+++ b/lib/models/ContentTermsOfUse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ContentTermsOfUse.class.php
+ * ContentTermsOfUse.php
  * model class for table licenses
  *
  * The ContentTermsOfUse class provides information about the terms under which
diff --git a/lib/models/Course.php b/lib/models/Course.php
index bfea7a0530ccce44b0d4c883de94252e82fda982..d8bb2f5779a40e9711502792a3fa964313e8bcd0 100644
--- a/lib/models/Course.php
+++ b/lib/models/Course.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Course.class.php
+ * Course.php
  * model class for table seminare
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/CourseMember.php b/lib/models/CourseMember.php
index cd7555f35b6a93dbf784f0863d60d01b332a8ac8..7c4b335c57cf934ee3a9a7eb60aa8132964ee3f1 100644
--- a/lib/models/CourseMember.php
+++ b/lib/models/CourseMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CourseMember.class.php
+ * CourseMember.php
  * model class for table seminar_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/CourseMemberNotification.php b/lib/models/CourseMemberNotification.php
index e72ba762be20770c83a6064efed1f2da8b6d6b94..5e1b544e6e06f047d65749619115b49385a2e532 100644
--- a/lib/models/CourseMemberNotification.php
+++ b/lib/models/CourseMemberNotification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CourseMemberNotification.class.php
+ * CourseMemberNotification.php
  * model class for table seminar_user_notification
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/Courseware/BlockTypes/Text.php b/lib/models/Courseware/BlockTypes/Text.php
index 917efb3dfe431c8f73c9b0f02692e3aabc9c424c..1da7cbe2b4d6204df378ad6b079173e552eac6ae 100644
--- a/lib/models/Courseware/BlockTypes/Text.php
+++ b/lib/models/Courseware/BlockTypes/Text.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-require_once 'lib/classes/Markup.class.php';
-
 /**
  * This class represents the content of a Courseware text block.
  *
diff --git a/lib/models/CronjobLog.php b/lib/models/CronjobLog.php
index c9e92f796dc7a1c1e47f57a339576375ceb60034..278a515dc8eb9ca35a29753a5439f43f8872cab0 100644
--- a/lib/models/CronjobLog.php
+++ b/lib/models/CronjobLog.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobLog.class.php
+// CronjobLog.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/models/CronjobSchedule.php b/lib/models/CronjobSchedule.php
index 0eb19ba8ea6c9014756730ce679f3ed52e3e2780..08a18d3c0e6b1e54585ae495f1d4a069807fa044 100644
--- a/lib/models/CronjobSchedule.php
+++ b/lib/models/CronjobSchedule.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobSchedule.class.php
+// CronjobSchedule.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/models/CronjobTask.php b/lib/models/CronjobTask.php
index 8a56ca0ad91928c2bb13cf2b02046c0598cdcfc0..1304bc1ee1dc6133c0e503b4deeb7efbcb09333a 100644
--- a/lib/models/CronjobTask.php
+++ b/lib/models/CronjobTask.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobSchedule.class.php
+// CronjobSchedule.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/models/Degree.php b/lib/models/Degree.php
index 6fef8342b489f954a097316ebe00f81c46f1f317..9c908d3314a2ec8f238c7b232f3cd4e2117e7124 100644
--- a/lib/models/Degree.php
+++ b/lib/models/Degree.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Degree.class.php
+ * Degree.php
  * model class for table studiengang
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/Deputy.php b/lib/models/Deputy.php
index e2917e7a018a436bdf8eb425b565702f78f71ca1..c74c7413e49cd7ff33315e7c24b62c829a7e1133 100644
--- a/lib/models/Deputy.php
+++ b/lib/models/Deputy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Deputy.class.php
+ * Deputy.php
  * model class for table deputies
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/HelpContent.php b/lib/models/HelpContent.php
index f1e61b1a3c6d8ffcb4cd3e0de1287bd0f824b105..e9a6f476bbd2cfd93a96c84cfa5b4579b3af5ce3 100644
--- a/lib/models/HelpContent.php
+++ b/lib/models/HelpContent.php
@@ -21,7 +21,7 @@
 //require_once 'lib/object.inc.php';
 
 /**
- * HelpContent.class.php - model class for Stud.IP help content
+ * HelpContent.php - model class for Stud.IP help content
  *
  * @author   Arne Schröder <schroeder@data-quest>
  * @access   public
diff --git a/lib/models/HelpTour.php b/lib/models/HelpTour.php
index 68bd8307ba19fa439241ebf638117d6d315043bd..978e2038df8bfcdae3846f049404a47aea4db586 100644
--- a/lib/models/HelpTour.php
+++ b/lib/models/HelpTour.php
@@ -21,7 +21,7 @@
 require_once 'lib/object.inc.php';
 
 /**
- * HelpTour.class.php - model class for Stud.IP tours
+ * HelpTour.php - model class for Stud.IP tours
  *
  *
  *
diff --git a/lib/models/HelpTourAudience.php b/lib/models/HelpTourAudience.php
index 6255a465d2539719b39628811f620149020dd31e..f341196b7aa53b4f74c2ba026d64f1eece2e8a3f 100644
--- a/lib/models/HelpTourAudience.php
+++ b/lib/models/HelpTourAudience.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourSteps.class.php - model class for tour audiences
+ * HelpTourSteps.php - model class for tour audiences
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/HelpTourSettings.php b/lib/models/HelpTourSettings.php
index f24c86b276edd8d3a1e8c168c7711d14c159cb7b..1cac957adeb4b13713905cafb6f06ff525040ed7 100644
--- a/lib/models/HelpTourSettings.php
+++ b/lib/models/HelpTourSettings.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourSteps.class.php - model class for tour steps
+ * HelpTourSteps.php - model class for tour steps
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/HelpTourStep.php b/lib/models/HelpTourStep.php
index 6f3132639fe46c8edbec89c8805b38283927510d..3bd5ad8aa24ca9ef1389e70b388c669d51e87264 100644
--- a/lib/models/HelpTourStep.php
+++ b/lib/models/HelpTourStep.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourSteps.class.php - model class for tour steps
+ * HelpTourSteps.php - model class for tour steps
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -104,4 +104,3 @@ class HelpTourStep extends SimpleORMap
         return true;
     }
 }
-
diff --git a/lib/models/HelpTourUser.php b/lib/models/HelpTourUser.php
index aa2869d14855e53ec4a718d811c337800fe5c626..49922250f13dceef517030122ad878fa43c82739 100644
--- a/lib/models/HelpTourUser.php
+++ b/lib/models/HelpTourUser.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourUser.class.php - model class for tour user visits
+ * HelpTourUser.php - model class for tour user visits
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/Institute.php b/lib/models/Institute.php
index 47cf27180f5bad7d4785c242c0fb72a595a583e7..df344ff2873f3ea9cf46773d7254f8daa3af8f92 100644
--- a/lib/models/Institute.php
+++ b/lib/models/Institute.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Institute.class.php - model class for table Institute
+ * Institute.php - model class for table Institute
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/LockRule.php b/lib/models/LockRule.php
index a3ef2713c3b133d2e2d13716a0289049f48b0ec0..83dec60c9eb18c89f0a3f0c059ae6b9c6b54bb4f 100644
--- a/lib/models/LockRule.php
+++ b/lib/models/LockRule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LockRule.class.php
+ * LockRule.php
  * model class for table lock_rule
  * this class represents one record of the lock_rules table
  * the column attributes is converted to an ArrayObject and vice-versa,
diff --git a/lib/models/LoginBackground.php b/lib/models/LoginBackground.php
index 3ede27551fee6c272ff71122bc6c723c24761dcb..530ae42285219e6ab2708dd02b5e9c0dd659dd16 100644
--- a/lib/models/LoginBackground.php
+++ b/lib/models/LoginBackground.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LoginBackground.class.php
+ * LoginBackground.php
  * model class for table loginbackgrounds
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/LoginFaq.php b/lib/models/LoginFaq.php
index d6cad4077f25c892adf7cb1efcef5564340f7077..4c049ac4c38ae476413c987cc8474a05a5974ec6 100644
--- a/lib/models/LoginFaq.php
+++ b/lib/models/LoginFaq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LoginFaq.class.php
+ * LoginFaq.php
  * model class for table login_faq
  *
  *
diff --git a/lib/models/Message.php b/lib/models/Message.php
index 46493d62165bd0b061616f7d9c4c4ad943a446b1..fb6b78eff2368b502a1afc55ff9f48e69b15a1a9 100644
--- a/lib/models/Message.php
+++ b/lib/models/Message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Message.class.php
+ * Message.php
  * model class for table message
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/MessageUser.php b/lib/models/MessageUser.php
index 0ae6dd5cfef30412990e27fa1ff8f2a54f085d53..1715de1e822a9769e63d4e41fa36d218b592d7fc 100644
--- a/lib/models/MessageUser.php
+++ b/lib/models/MessageUser.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MessageUser.class.php
+ * MessageUser.php
  * model class for table message_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/MvvOverlappingConflict.php b/lib/models/MvvOverlappingConflict.php
index 6ac8e298648079897385bc650988918a01777740..54b367fee8fd5af56bea7f8be14483192bcbeb08 100644
--- a/lib/models/MvvOverlappingConflict.php
+++ b/lib/models/MvvOverlappingConflict.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MvvOverlappingConflict.class.php - model class for table mvv_ovl_conflicts
+ * MvvOverlappingConflict.php - model class for table mvv_ovl_conflicts
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/MvvOverlappingExclude.php b/lib/models/MvvOverlappingExclude.php
index d199e3040b51a41e89f5b2c4e20cba3c76c2a0c9..6cde4148bc017349e9b5ddf561996cc497e708a3 100644
--- a/lib/models/MvvOverlappingExclude.php
+++ b/lib/models/MvvOverlappingExclude.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * MvvOverlappingExclude.class.php - model class for table mvv_ovl_excludes
+ * MvvOverlappingExclude.php - model class for table mvv_ovl_excludes
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -46,4 +46,3 @@ class MvvOverlappingExclude extends SimpleORMap
     }
 
 }
-
diff --git a/lib/models/MvvOverlappingSelection.php b/lib/models/MvvOverlappingSelection.php
index 9d159e2d6f9b6df00bf3b413a80ea14361e99c12..b3fcc15a701a45f7f56bf6b3542de3a00399f935 100644
--- a/lib/models/MvvOverlappingSelection.php
+++ b/lib/models/MvvOverlappingSelection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MvvOverlappingSelection.class.php - model class for table mvv_ovl_selections
+ * MvvOverlappingSelection.php - model class for table mvv_ovl_selections
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/NewsRange.php b/lib/models/NewsRange.php
index 77852145abedf8fb82b4abec49748e0127e5ff4f..675478f5ce0146e6a5d5a71dfc2a05339d6b0926 100644
--- a/lib/models/NewsRange.php
+++ b/lib/models/NewsRange.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * NewsRange.class.php - model class for table Institute
+ * NewsRange.php - model class for table Institute
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/NewsRoles.php b/lib/models/NewsRoles.php
index 56da6ec6017cbabe18f6e5b4556df17f64cb8eb7..28a40646d5d9723ebb1f33fb7181d059018213ce 100644
--- a/lib/models/NewsRoles.php
+++ b/lib/models/NewsRoles.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * NewsRoles.class.php - model class for the news roles
+ * NewsRoles.php - model class for the news roles
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/Semester.php b/lib/models/Semester.php
index 03243a57d04049020951bd5d376a1b4153179a70..ef3246b8c66bc55908ff322abc51ccd40b789aab 100644
--- a/lib/models/Semester.php
+++ b/lib/models/Semester.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Semester.class.php
+ * Semester.php
  * model class for table semester_data
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/SemesterCourse.php b/lib/models/SemesterCourse.php
index 04590e34ae40e555d909dc7b13342038fcceecf7..79e52301cded926ab1fd6d84a55d8479b1e4faba 100644
--- a/lib/models/SemesterCourse.php
+++ b/lib/models/SemesterCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SemesterCourse.class.php
+ * SemesterCourse.php
  * Contains the SemesterCourse model.
  *
  * This class represents entries in the mapping table
diff --git a/lib/models/SemesterHoliday.php b/lib/models/SemesterHoliday.php
index 90f9ecd3f3ff4becf70f836708060ae7dcd88cf2..265f8e1b23bbd3ac9eacd95c9b2d9211dca7557d 100644
--- a/lib/models/SemesterHoliday.php
+++ b/lib/models/SemesterHoliday.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SemesterHoliday.class.php
+ * SemesterHoliday.php
  * model class for table semester_holiday
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php
index f384426895455a32e5b0fbb79972146592105304..b8431a3fd41c5934f106265112ca6cb70d1e75d2 100644
--- a/lib/models/SeminarCycleDate.php
+++ b/lib/models/SeminarCycleDate.php
@@ -6,7 +6,7 @@ require_once 'lib/dates.inc.php';
 
 
 /**
- * SeminarCycleDate.class.php
+ * SeminarCycleDate.php
  * model class for table seminar_cycle_dates
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/StudipComment.php b/lib/models/StudipComment.php
index 2e0389d53108b42cf757ea0d3d2f8bfa98b16b53..79610f854d1e79ebe495998346aa1e2fc7b83686 100644
--- a/lib/models/StudipComment.php
+++ b/lib/models/StudipComment.php
@@ -23,7 +23,7 @@
 // +---------------------------------------------------------------------------+
 
 /**
- * StudipComment.class.php
+ * StudipComment.php
  *
  *
  *
diff --git a/lib/models/StudipNews.php b/lib/models/StudipNews.php
index 12eb3e13d84670d5fc842707549701f6d37eda31..ccb1828cdda146198717698fee0dc06f8fff1c9c 100644
--- a/lib/models/StudipNews.php
+++ b/lib/models/StudipNews.php
@@ -21,7 +21,7 @@
 require_once 'lib/object.inc.php';
 
 /**
- * StudipNews.class.php
+ * StudipNews.php
  *
  * @author   André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
  * @author   Arne Schröder <schroeder@data-quest>
diff --git a/lib/models/StudipScmEntry.php b/lib/models/StudipScmEntry.php
index 7001a4a29ad7c30c90fb69db8d8f9200f215f025..30c13d30213606e55938ae3641fbd0614e85343d 100644
--- a/lib/models/StudipScmEntry.php
+++ b/lib/models/StudipScmEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipScmEntry.class.php
+ * StudipScmEntry.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/StudyCourse.php b/lib/models/StudyCourse.php
index faf6df46ff7241193487c284755fc3a0f8ea935d..91937ea036214624135840fffc9996464c4353e2 100644
--- a/lib/models/StudyCourse.php
+++ b/lib/models/StudyCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudyCourse.class.php
+ * StudyCourse.php
  * model class for table studiengang
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/ToolActivation.php b/lib/models/ToolActivation.php
index a4a4de24e37cc9170d1a32757aad2593277fe983..4209a20ff231fa718f72b571e978263b435f2bba 100644
--- a/lib/models/ToolActivation.php
+++ b/lib/models/ToolActivation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ToolActivation.class.php
+ * ToolActivation.php
  * model class for table tools_activated
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/User.php b/lib/models/User.php
index 4894031b7caaf8087be74e36b46df872990622d5..3fcc3f5383e31690d5f5cadfe81187fb3a952545 100644
--- a/lib/models/User.php
+++ b/lib/models/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * User.class.php
+ * User.php
  * model class for combined auth_user_md5/user_info record
  * this class represents one user, the attributes from tables
  * auth_user_md5 and user_info were merged.
@@ -395,7 +395,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
     }
 
     /**
-     * Temporary migrate to User.class.php
+     * Temporary migrate to User.php
      *
      * @param $attributes
      * @return array
diff --git a/lib/models/UserInfo.php b/lib/models/UserInfo.php
index 28808a22ce56bcd8dfc4fa4f88c68d66dd15f409..62a63fc5aa61511046db007106cb4b494b5213b9 100644
--- a/lib/models/UserInfo.php
+++ b/lib/models/UserInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserInfo.class.php
+ * UserInfo.php
  * model class for table user_info
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/UserOnline.php b/lib/models/UserOnline.php
index e18322dd523d188530206ce46ac351802053137c..c3efba2b15b96bad8664ab8869c67bd0c31e5682 100644
--- a/lib/models/UserOnline.php
+++ b/lib/models/UserOnline.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * UserOnline.class.php
+ * UserOnline.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -24,4 +24,4 @@ class UserOnline extends SimpleORMap
         $config['db_table'] = 'user_online';
         parent::configure($config);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/models/UserStudyCourse.php b/lib/models/UserStudyCourse.php
index cac37c89ead389e3bb85edd6dbf726e8ac6f33d6..aeac38bd0587c3d5365ee1c6ead0825f376368d7 100644
--- a/lib/models/UserStudyCourse.php
+++ b/lib/models/UserStudyCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserStudyCourse.class.php
+ * UserStudyCourse.php
  * model class for table user_studiengang
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/WebserviceAccessRule.php b/lib/models/WebserviceAccessRule.php
index 48da0efbbe0d00d79e3e2fb1c3f2edf4fb400bf3..120ac471ed3beb74eb722631b2bf451b20fe4167 100644
--- a/lib/models/WebserviceAccessRule.php
+++ b/lib/models/WebserviceAccessRule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WebserviceAccessRule.class.php
+ * WebserviceAccessRule.php
  * model class for table webservice_access_rules
  * this class represents one record of the table webservice_access_rules
  * the column ip_range is converted from a comma separated list to an ArrayObject and vice-versa,
diff --git a/lib/models/WikiPage.php b/lib/models/WikiPage.php
index 67ddd7e63748495817719363fed92e2efee337b5..b5f0101338cfbc3e2e3d4631ee228940a8580e2d 100644
--- a/lib/models/WikiPage.php
+++ b/lib/models/WikiPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WikiPage.class.php
+ * WikiPage.php
  * model class for table wiki
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/calendar/CalendarDate.php b/lib/models/calendar/CalendarDate.php
index d901cf18b219961526342c222637f1e4ae314907..0318dab5ef8de330a130938f30f954102b5e2ffe 100644
--- a/lib/models/calendar/CalendarDate.php
+++ b/lib/models/calendar/CalendarDate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CalendarDate.class.php - Model class for calendar dates.
+ * CalendarDate.php - Model class for calendar dates.
  *
  * CalendarDate represents a date in the personal calendar.
  *
diff --git a/lib/models/calendar/CalendarDateAssignment.php b/lib/models/calendar/CalendarDateAssignment.php
index e0bf467fe86ad7ef4a298c9bc52e53e076363120..e0e2135452d066260cac2000604e3bef6d33f6b1 100644
--- a/lib/models/calendar/CalendarDateAssignment.php
+++ b/lib/models/calendar/CalendarDateAssignment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CalendarDateAssignment.class.php - Model class for calendar date assignments.
+ * CalendarDateAssignment.php - Model class for calendar date assignments.
  *
  * CalendarDateAssignment represents the assignment of a calendar date
  *  to a specific calendar. The calendar is represented by a range-ID
diff --git a/lib/models/resources/BrokenResource.php b/lib/models/resources/BrokenResource.php
index 5266b4f1430672a1af820f0aadd5a4240eb30c5f..fc44e8213064db249739d2940a585bc44d3aabac 100644
--- a/lib/models/resources/BrokenResource.php
+++ b/lib/models/resources/BrokenResource.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceLabel.class.php - model class for a resource label
+ * ResourceLabel.php - model class for a resource label
  *
  * The BrokenResource class represents resources whose class
  * cannot be found due to missing Resource specialisations
diff --git a/lib/models/resources/Building.php b/lib/models/resources/Building.php
index 0edb98393a1c34c2fc6c8d2159860073d993fece..a1c071a095a4138c1182321beeb482aad1b8daad 100644
--- a/lib/models/resources/Building.php
+++ b/lib/models/resources/Building.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Building.class.php - model class for a resource which is a building
+ * Building.php - model class for a resource which is a building
  *
  * The building class is a derived class from the Resource class
  * which includes specialisations for Building resource types.
diff --git a/lib/models/resources/GlobalResourceLock.php b/lib/models/resources/GlobalResourceLock.php
index b1753f5e9e7d9d32fc9d06b0a4da821e64e6eea4..ed748e138b1fcb7708b50a61b4943e256d3a05ef 100644
--- a/lib/models/resources/GlobalResourceLock.php
+++ b/lib/models/resources/GlobalResourceLock.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GlobalResourceLock.class.php - model class for resource locks
+ * GlobalResourceLock.php - model class for resource locks
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/Location.php b/lib/models/resources/Location.php
index 8e793821622859f5b2e4fcbb25063bde74cc27d2..9da2e113703696b6612391656665ef5351a3e1ea 100644
--- a/lib/models/resources/Location.php
+++ b/lib/models/resources/Location.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Location.class.php - model class for a resource which is a location
+ * Location.php - model class for a resource which is a location
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/Resource.php b/lib/models/resources/Resource.php
index 92d810773bd7f6a2041b57da0db8348a4eb7c68f..32fce2b59261d83bc8af6c48d551646e4383592b 100644
--- a/lib/models/resources/Resource.php
+++ b/lib/models/resources/Resource.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Resource.class.php - model class for a resource
+ * Resource.php - model class for a resource
  *
  * The Resource class is the base class of the new
  * Room and Resource management system in Stud.IP.
diff --git a/lib/models/resources/ResourceBooking.php b/lib/models/resources/ResourceBooking.php
index 89507139d21f52a251b948f644ff01cd62a4f6fc..977cf32ec49a4fef93ca0ff99aca1c9f5fc11642 100644
--- a/lib/models/resources/ResourceBooking.php
+++ b/lib/models/resources/ResourceBooking.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBooking.class.php - model class for resource bookings
+ * ResourceBooking.php - model class for resource bookings
  *
  * The ResourceBooking class is responsible for storing
  * bookings of resources in a specified time range
diff --git a/lib/models/resources/ResourceBookingInterval.php b/lib/models/resources/ResourceBookingInterval.php
index 7908e4076e6d91190e8559ea8ea58f1a185c37f0..47f01cc0ea8e60712001d38c6c13fd1b7029333b 100644
--- a/lib/models/resources/ResourceBookingInterval.php
+++ b/lib/models/resources/ResourceBookingInterval.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingInterval.class.php - model class for storing
+ * ResourceBookingInterval.php - model class for storing
  * all resource bookings time intervals, including those for
  * repetitions.
  *
diff --git a/lib/models/resources/ResourceCategory.php b/lib/models/resources/ResourceCategory.php
index 766a5f61f973e28dd9f42b534e9f3b66d70aefa4..cfe323a54df687e91b17c6e2a8d65f3f961a582a 100644
--- a/lib/models/resources/ResourceCategory.php
+++ b/lib/models/resources/ResourceCategory.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceCategory.class.php - model class for resource categories
+ * ResourceCategory.php - model class for resource categories
  *
  * The ResourceCategory class can be used as a Factory for
  * Resource objects.
diff --git a/lib/models/resources/ResourceCategoryProperty.php b/lib/models/resources/ResourceCategoryProperty.php
index b1460cdaa71d96b509c09868db1710bda9567e23..c9ac66ee216698ee63d966522bb6455fb0e61bed 100644
--- a/lib/models/resources/ResourceCategoryProperty.php
+++ b/lib/models/resources/ResourceCategoryProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceCategoryProperty.class.php - model class for
+ * ResourceCategoryProperty.php - model class for
  * resource category properties
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/resources/ResourceLabel.php b/lib/models/resources/ResourceLabel.php
index d9c869f605d4a05403f506bac504427775471be3..c46572396a16e2f91654b65dba14cce500e4252d 100644
--- a/lib/models/resources/ResourceLabel.php
+++ b/lib/models/resources/ResourceLabel.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceLabel.class.php - model class for a resource label
+ * ResourceLabel.php - model class for a resource label
  *
  * The ResourceLabel class represents headings or subheadings whose
  * only purpose is helping with organising the resource tree.
diff --git a/lib/models/resources/ResourcePermission.php b/lib/models/resources/ResourcePermission.php
index bd337088c904134a1929bf5624fe35f3bc363e82..044db839837e9ff2e6971fc74dff7e1e84b4ebb3 100644
--- a/lib/models/resources/ResourcePermission.php
+++ b/lib/models/resources/ResourcePermission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePermission.class.php - model class for resource permissions.
+ * ResourcePermission.php - model class for resource permissions.
  *
  * Description of the resources permission system:
  * - admin: An admin may do everything in the resource management:
diff --git a/lib/models/resources/ResourceProperty.php b/lib/models/resources/ResourceProperty.php
index 4bbc4ec254616ecf7565972d12a0b975a03f1843..4f7a3299bc480e65d439b29e492259f7d5b68ddb 100644
--- a/lib/models/resources/ResourceProperty.php
+++ b/lib/models/resources/ResourceProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceProperty.class.php - model class for resource properties
+ * ResourceProperty.php - model class for resource properties
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourcePropertyDefinition.php b/lib/models/resources/ResourcePropertyDefinition.php
index 450ec001e12396a38fce94f8de0e18d89dc504ae..b87e8e6dd666a67451cc9766535301237545cfc5 100644
--- a/lib/models/resources/ResourcePropertyDefinition.php
+++ b/lib/models/resources/ResourcePropertyDefinition.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyDefinition.class.php - model class for resource property definitions
+ * ResourcePropertyDefinition.php - model class for resource property definitions
  *
  * The ResourcePropertyDefinition class can be used as a Factory
  * for ResourceProperty objects.
diff --git a/lib/models/resources/ResourcePropertyGroup.php b/lib/models/resources/ResourcePropertyGroup.php
index ad539022a8c22a4cbc219eb8439801606ec5671a..f6ea82528a899b648ac7ccf160ef903e5023c859 100644
--- a/lib/models/resources/ResourcePropertyGroup.php
+++ b/lib/models/resources/ResourcePropertyGroup.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyGroup.class.php - model class for resource property groups
+ * ResourcePropertyGroup.php - model class for resource property groups
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php
index b2f5524f02abd5e0ef97ced4a13f0433191e20f7..df77b19ff0d9514d5bff980e49ed8dd753679b34 100644
--- a/lib/models/resources/ResourceRequest.php
+++ b/lib/models/resources/ResourceRequest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequest.class.php - Contains a model class for resource requests.
+ * ResourceRequest.php - Contains a model class for resource requests.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourceRequestAppointment.php b/lib/models/resources/ResourceRequestAppointment.php
index 929733bdc8515e837db1b191df85b935e16a3fb6..63384a200c017debb3ade9f199e1203b7b11b93f 100644
--- a/lib/models/resources/ResourceRequestAppointment.php
+++ b/lib/models/resources/ResourceRequestAppointment.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequestAppointment.class.php - Contains a model class for
+ * ResourceRequestAppointment.php - Contains a model class for
  * the resource_request_appointments table.
  *
  * ResourceRequestAppointment is a model class to connect
diff --git a/lib/models/resources/ResourceRequestProperty.php b/lib/models/resources/ResourceRequestProperty.php
index 2952be9ba35ffb86062159ce24115840a788c4ad..c387daa59c30193a2bc3c8d14073e29035b483b0 100644
--- a/lib/models/resources/ResourceRequestProperty.php
+++ b/lib/models/resources/ResourceRequestProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequestProperty.class.php - model class for
+ * ResourceRequestProperty.php - model class for
  * resource request properties
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/resources/ResourceTemporaryPermission.php b/lib/models/resources/ResourceTemporaryPermission.php
index ddbc397c3e4aca12b4b1316ad3a6aba98a0b56e9..ad7b33a077385bb647c62dd93fcbc4b6d0ca0c96 100644
--- a/lib/models/resources/ResourceTemporaryPermission.php
+++ b/lib/models/resources/ResourceTemporaryPermission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceTemporaryPermission.class.php
+ * ResourceTemporaryPermission.php
  * Contains the ResourceTemporaryPermission class
  *
  * The ResourceTemporaryPermission class represents temporary permissions
diff --git a/lib/models/resources/Room.php b/lib/models/resources/Room.php
index 7f1668e441f210b60376ef858b87843361190810..c8e393cb9272305fdeac97c3849439f9ae055bef 100644
--- a/lib/models/resources/Room.php
+++ b/lib/models/resources/Room.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Room.class.php - model class for a resource which is a room
+ * Room.php - model class for a resource which is a room
  *
  * The Room class is a derived class of the Resource class.
  * It containts specialisations for room resources.
diff --git a/lib/models/resources/RoomRequest.php b/lib/models/resources/RoomRequest.php
index 6db9c38fb6a2548b0ed2e6ff12ea073a72f2900a..4ba11bce53be5aad9d35b8f4a6ce6fcec184feb1 100644
--- a/lib/models/resources/RoomRequest.php
+++ b/lib/models/resources/RoomRequest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RoomRequest.class.php - model class for table resource_requests
+ * RoomRequest.php - model class for table resource_requests
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/SeparableRoom.php b/lib/models/resources/SeparableRoom.php
index 9ec1ccfeae3e51b310fdd64a303f8cc2d0734c71..d1bf125bd4e0a6dd1c8d663f692c6d5b747862d5 100644
--- a/lib/models/resources/SeparableRoom.php
+++ b/lib/models/resources/SeparableRoom.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * SeparableRoom.class.php - model class for a separable room
+ * SeparableRoom.php - model class for a separable room
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/SeparableRoomPart.php b/lib/models/resources/SeparableRoomPart.php
index e7e99e7249c4a131ef1996074a299e11240982ff..8a45ce7163f35c2c2b92425e659f07f02d342bee 100644
--- a/lib/models/resources/SeparableRoomPart.php
+++ b/lib/models/resources/SeparableRoomPart.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * SeparableRoomItem.class.php - model class for a separable room item
+ * SeparableRoomItem.php - model class for a separable room item
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/CoreForum.php b/lib/modules/CoreForum.php
index 3a43372c2041171a726e350505eb5918e46d724b..0283a09df03c53cb2e2b9801eea275ac55c68f5e 100644
--- a/lib/modules/CoreForum.php
+++ b/lib/modules/CoreForum.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Forum.class.php - Forum
+ * Forum.php - Forum
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/FeedbackModule.php b/lib/modules/FeedbackModule.php
index 8674f62687b4dde2d93dcb74b810aa2dd682bdb4..2fc657d3d6d93045b749fab8449671f278e49c6e 100644
--- a/lib/modules/FeedbackModule.php
+++ b/lib/modules/FeedbackModule.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * FeedbackModule.class.php - Feedback Elements for Stud.IP as Module.
+ * FeedbackModule.php - Feedback Elements for Stud.IP as Module.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/GradebookModule.php b/lib/modules/GradebookModule.php
index 66886a243d5b17ec7219cd57cdf07e2af55c8d9c..45cd93edc6bdb9de8fffee2636000ad686076eff 100644
--- a/lib/modules/GradebookModule.php
+++ b/lib/modules/GradebookModule.php
@@ -4,7 +4,7 @@ use Grading\Definition;
 use Grading\Instance;
 
 /**
- * GradebookModule.class.php - Gradebook API for Stud.IP.
+ * GradebookModule.php - Gradebook API for Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/LtiToolModule.php b/lib/modules/LtiToolModule.php
index 033f5e80c8b580edf0a6ee106e1c70021394f0e6..74fd70aa8e1f38130a2376cec2547cb80f9fc398 100644
--- a/lib/modules/LtiToolModule.php
+++ b/lib/modules/LtiToolModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LtiToolModule.class.php - LTI consumer API for Stud.IP
+ * LtiToolModule.php - LTI consumer API for Stud.IP
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/object.inc.php b/lib/object.inc.php
index c23efa45380a24e822cb786af764b3dbedb7d4b3..a8bd5d7bce91ba9ad03362200a167ed99434aa12 100644
--- a/lib/object.inc.php
+++ b/lib/object.inc.php
@@ -51,7 +51,7 @@ function object_set_visit_module($plugin_id)
 * This function saves the actual time as last visitdate for the given object, user and type
 *
 * @param    string  the id of the object (i.e. seminar_id, news_id, vote_id)
-* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.class.php for definitions)
+* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.php for definitions)
 * @param    string  the user who visited the object - if not given, the actual user is used
 *
 */
@@ -81,7 +81,7 @@ function object_set_visit($object_id, $plugin_id, $user_id = '')
 * This function gets the (last) visit time for an object or module. If no information is found, the last visit of the open-object can bes used
 *
 * @param    string  the id of the object (i.e. seminar_id, news_id, vote_id)
-* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.class.php for definitions OR sem/inst, if the visit for the whole seminar was saved)
+* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.php for definitions OR sem/inst, if the visit for the whole seminar was saved)
 * @param    string  the return-mode: 'last' for the last visit, other for actual-visit
 * @param    string  the user who visited the object - if not given, the actual user is used
 * @param    string  the id of an open-object (seminar or inst), to gather information for last visit from the visit of the whole open-object
diff --git a/lib/phplib/Seminar_Auth.php b/lib/phplib/Seminar_Auth.php
index 2c1c60c3b92df68c1fa03519fcdd8bb8b5877d77..950be8a094795bf8bfd795fe4f19894b5857c13d 100644
--- a/lib/phplib/Seminar_Auth.php
+++ b/lib/phplib/Seminar_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Auth.class.php
+ * Seminar_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_Default_Auth.php b/lib/phplib/Seminar_Default_Auth.php
index 6d0e46c902faedb64d06f8e59c895a951e945596..146c5888be46be6e38cff2d72178b68ce5529b29 100644
--- a/lib/phplib/Seminar_Default_Auth.php
+++ b/lib/phplib/Seminar_Default_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Default_Auth.class.php
+ * Seminar_Default_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -16,4 +16,4 @@
 class Seminar_Default_Auth extends Seminar_Auth
 {
     protected $nobody = true;
-}
\ No newline at end of file
+}
diff --git a/lib/phplib/Seminar_Perm.php b/lib/phplib/Seminar_Perm.php
index a116938f8a705d35e3d49d76640d5aadb7748610..1c3a85e95f308b5d615ccbe8ad973dc7fcf60a37 100644
--- a/lib/phplib/Seminar_Perm.php
+++ b/lib/phplib/Seminar_Perm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Perm.class.php
+ * Seminar_Perm.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_Register_Auth.php b/lib/phplib/Seminar_Register_Auth.php
index f2a272e16ae52b4da229cfc6d17cf083565196db..5bf10f188468a543f39f4c9be9528ba71272a7c5 100644
--- a/lib/phplib/Seminar_Register_Auth.php
+++ b/lib/phplib/Seminar_Register_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Register_Auth.class.php
+ * Seminar_Register_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_User.php b/lib/phplib/Seminar_User.php
index c82d73a4d265a2b9f046b934162e22acd398a806..4dd59bc203998f0cf11c7a84eedfafaf87989c96 100644
--- a/lib/phplib/Seminar_User.php
+++ b/lib/phplib/Seminar_User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Seminar_User.class.php
+ * Seminar_User.php
  * global object representing current user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/plugins/core/AdministrationPlugin.php b/lib/plugins/core/AdministrationPlugin.php
index c9aa8da0c8ea3bc995c1f1b20702bc469e806bb8..6856e6a9352b69cf2246a7d131da5489c04ff012 100644
--- a/lib/plugins/core/AdministrationPlugin.php
+++ b/lib/plugins/core/AdministrationPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * AdministrationPlugin.class.php - administration plugin interface
+ * AdministrationPlugin.php - administration plugin interface
  *
  * NOTE: This interface is deprecated, use SystemPlugin instead.
  *
diff --git a/lib/plugins/core/CorePlugin.php b/lib/plugins/core/CorePlugin.php
index d059f4cca477453dae79ae7eda27058a787999bb..056efaf6ac10b112211bf2cc6e28ebd23e7fea37 100644
--- a/lib/plugins/core/CorePlugin.php
+++ b/lib/plugins/core/CorePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CorePlugin.class.php - base class
+ * CorePlugin.php - base class
  *
  * @author    André Noack <noack@data-quest.de>
  * @copyright 2021 Authors
diff --git a/lib/plugins/core/DetailspagePlugin.php b/lib/plugins/core/DetailspagePlugin.php
index 36e6efa9d7ef4f38163047fbc5fe08020579cef8..3cc3b57a01bc8d166a31fad542b6ecf48a2331b4 100644
--- a/lib/plugins/core/DetailspagePlugin.php
+++ b/lib/plugins/core/DetailspagePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * DetailspagePlugin.class.php
+ * DetailspagePlugin.php
  *
  * Copyright (c) 2019 - Rasmus Fuhse <fuhse@data-quest.de>
  *
diff --git a/lib/plugins/core/ForumModule.php b/lib/plugins/core/ForumModule.php
index 33784db9594a033ea16c31a24349d5beeef54eca..e72ffc263970c6847587b38a2df536280dafad07 100644
--- a/lib/plugins/core/ForumModule.php
+++ b/lib/plugins/core/ForumModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ForumModule.class.php - Interface for all intersections between the Stud.IP 
+ * ForumModule.php - Interface for all intersections between the Stud.IP
  *                         Core and something that behaves like a forum
  *
  * Implement all interface methods and you can integrate your plugin like
@@ -137,4 +137,4 @@ interface ForumModule extends StandardPlugin
      * @return string  a single-page HTML-view of all contents in one string
      */
     function getDump($seminar_id);
-}
\ No newline at end of file
+}
diff --git a/lib/plugins/core/HomepagePlugin.php b/lib/plugins/core/HomepagePlugin.php
index 37efb54e66e3a01cd58d642d469203bbee009019..b0dbd6510edd8e1513075fe64f32a9f110fb2306 100644
--- a/lib/plugins/core/HomepagePlugin.php
+++ b/lib/plugins/core/HomepagePlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * HomepagePlugin.class.php - home page plugin interface
+ * HomepagePlugin.php - home page plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/core/LibraryPlugin.php b/lib/plugins/core/LibraryPlugin.php
index a7fb87313c90630776a1fd702ae26d9c21443e19..3c1a7516cb96d1341af58364ab97b59421e0dc4a 100644
--- a/lib/plugins/core/LibraryPlugin.php
+++ b/lib/plugins/core/LibraryPlugin.php
@@ -2,7 +2,7 @@
 
 
 /*
- * LibraryPlugin.class.php - A plugin class for library plugins.
+ * LibraryPlugin.php - A plugin class for library plugins.
  *
  * Copyright (c) 2020  Moritz Strohm
  *
diff --git a/lib/plugins/core/PortalPlugin.php b/lib/plugins/core/PortalPlugin.php
index cb5aca434623738229a547a12b5d46b34f04c2fe..826e410764ef1036c52f361d6af157ef8b029629 100644
--- a/lib/plugins/core/PortalPlugin.php
+++ b/lib/plugins/core/PortalPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * PortalPlugin.class.php - start / portal page plugin interface
+ * PortalPlugin.php - start / portal page plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/core/Role.php b/lib/plugins/core/Role.php
index 3ca8a11e3786588b193069936a309c0381a6db71..91e00e852dc43cab10186b1d0d392cff4cca0fb0 100644
--- a/lib/plugins/core/Role.php
+++ b/lib/plugins/core/Role.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Role.class.php
+ * Role.php
  *
  * @author      Dennis Reil <dennis.reil@offis.de>
  * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
diff --git a/lib/plugins/core/StandardPlugin.php b/lib/plugins/core/StandardPlugin.php
index 960ffd0f3be861b431b2ded11a5b0929b754c375..518089119b566c09c308ce9412cab78cfad92e66 100644
--- a/lib/plugins/core/StandardPlugin.php
+++ b/lib/plugins/core/StandardPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * StandardPlugin.class.php - course or institute plugin interface
+ * StandardPlugin.php - course or institute plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/core/StudIPPlugin.php b/lib/plugins/core/StudIPPlugin.php
index fe74259dcff280de242d15527aa27ec8fb6d1577..6642dbdc989ab4ea2dcf8fae935dcb402ce0bcc9 100644
--- a/lib/plugins/core/StudIPPlugin.php
+++ b/lib/plugins/core/StudIPPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudIPPlugin.class.php - generic plugin base class
+ * StudIPPlugin.php - generic plugin base class
  *
  * @author    Elmar Ludwig <ludwig@uos.de>
  * @copyright 2009 Authors
diff --git a/lib/plugins/core/SystemPlugin.php b/lib/plugins/core/SystemPlugin.php
index c204567f720cf183753458fdcdfc6ef20bbb5da2..0ffd16f01ea6740059fbb4491944b502026fcff9 100644
--- a/lib/plugins/core/SystemPlugin.php
+++ b/lib/plugins/core/SystemPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * SystemPlugin.class.php - generic system plugin interface
+ * SystemPlugin.php - generic system plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/db/RolePersistence.php b/lib/plugins/db/RolePersistence.php
index df63a773debc8e975e553354270ecef6c2b8e304..54a0053941ed1d2a43ed5acf8758121d31dfa61a 100644
--- a/lib/plugins/db/RolePersistence.php
+++ b/lib/plugins/db/RolePersistence.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * RolePersistence.class.php
+ * RolePersistence.php
  *
  * Funktionen für das Rollenmanagement
  *
diff --git a/lib/plugins/engine/PluginManager.php b/lib/plugins/engine/PluginManager.php
index 7e36fa0ae4ae7ef0b4d185985dbb81d0568b8a51..ec434a95ff5298fd2da427e060e09a3fa1844155 100644
--- a/lib/plugins/engine/PluginManager.php
+++ b/lib/plugins/engine/PluginManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PluginManager.class.php - plugin manager for Stud.IP
+ * PluginManager.php - plugin manager for Stud.IP
  *
  * @copyright  2009  Elmar Ludwig
  * @license GPL2 or any later version
@@ -351,10 +351,10 @@ class PluginManager
             $path = 'lib/modules';
         }
 
-        $pluginfile = $basepath.'/'.$path.'/'.$class.'.class.php';
+        $pluginfile = $basepath.'/'.$path.'/'.$class.'.php';
 
         if (!file_exists($pluginfile)) {
-            $pluginfile = $basepath.'/'.$path.'/'.$class.'.php';
+            $pluginfile = $basepath.'/'.$path.'/'.$class.'.class.php';
 
             if (!file_exists($pluginfile)) {
                 return null;
diff --git a/lib/plugins/engine/PluginRepository.php b/lib/plugins/engine/PluginRepository.php
index 235e9bd97b36087e2e666ef3eef6ae653488a437..4bd24c6dfe131e99e883bbe6d11033129495c32b 100644
--- a/lib/plugins/engine/PluginRepository.php
+++ b/lib/plugins/engine/PluginRepository.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * PluginRepository.class.php - query plugin meta data
+ * PluginRepository.php - query plugin meta data
  *
  * Copyright (c) 2008  Elmar Ludwig
  *
diff --git a/lib/raumzeit/CycleData.php b/lib/raumzeit/CycleData.php
index 587e0bc7f5f60d066816f0024506a0ca370e34a9..d89d8aeb17f276b4bc65b3db1e5e8270f3e4ea1f 100644
--- a/lib/raumzeit/CycleData.php
+++ b/lib/raumzeit/CycleData.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CycleData.class.php
+// CycleData.php
 //
 // Repräsentiert ein Turnusdatum eines MetaDates
 //
diff --git a/lib/raumzeit/CycleDataDB.php b/lib/raumzeit/CycleDataDB.php
index eb586b419292b4fb8fe4b7bc8c3ca9ddd3165a10..715df0b3f08c3f6454bf860731323bdf090b2d05 100644
--- a/lib/raumzeit/CycleDataDB.php
+++ b/lib/raumzeit/CycleDataDB.php
@@ -5,9 +5,9 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CycleDataDB.class.php
+// CycleDataDB.php
 //
-// Datenbank-Abfragen für CycleData.class.php
+// Datenbank-Abfragen für CycleData.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 
 /**
- * CycleDataDB.class.php
+ * CycleDataDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/Issue.php b/lib/raumzeit/Issue.php
index 939aaeecc43850e8805c3b79b526806e5fa75d33..eeb38b3922d03b30d1e577f4443a93be379fc2d2 100644
--- a/lib/raumzeit/Issue.php
+++ b/lib/raumzeit/Issue.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// Issue.class.php
+// Issue.php
 //
 // Repräsentiert ein einzelnes Thema einer Veranstaltung
 //
@@ -26,7 +26,7 @@
 
 
 /**
- * Issue.class.php
+ * Issue.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
@@ -156,7 +156,7 @@ class Issue {
     function restore() {
         /*
          * To avoid inconsistency, the restore function has been removed.
-         * The only way to load an Issue is via the Seminar.class.php, with the function fillValuesFromArray
+         * The only way to load an Issue is via the Seminar.php, with the function fillValuesFromArray
          */
         $this->fillValuesFromArray(IssueDB::restoreIssue($this->issue_id));
     }
diff --git a/lib/raumzeit/IssueDB.php b/lib/raumzeit/IssueDB.php
index d6c0ba344504fc2c7fd4bf94280252d60f69fbf1..17d8b95e00037e916ecd47af5d6c2ca4453a7e59 100644
--- a/lib/raumzeit/IssueDB.php
+++ b/lib/raumzeit/IssueDB.php
@@ -5,9 +5,9 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// IssueDB.class.php
+// IssueDB.php
 //
-// Datenbank-Abfragen für Issue.class.php
+// Datenbank-Abfragen für Issue.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 
 /**
- * IssueDB.class.php
+ * IssueDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/MetaDate.php b/lib/raumzeit/MetaDate.php
index 0af632d0f09fee6e0b07f6b99fc9426b7ad2ef68..1348222880788618aaeacd4aaab1c33d46c2a9f4 100644
--- a/lib/raumzeit/MetaDate.php
+++ b/lib/raumzeit/MetaDate.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// MetaDate.class.php
+// MetaDate.php
 //
 // Repräsentiert die Zeit- und Turnusdaten einer Veranstaltung
 //
@@ -26,7 +26,7 @@
 
 
 /**
- * MetaDate.class.php
+ * MetaDate.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/MetaDateDB.php b/lib/raumzeit/MetaDateDB.php
index 5f5e1dfda4ce2622b46de9c36411045958f33f29..29af00ec1c57a922a0bd8ccb711d478761708539 100644
--- a/lib/raumzeit/MetaDateDB.php
+++ b/lib/raumzeit/MetaDateDB.php
@@ -6,9 +6,9 @@
 
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// MetaDateDB.class.php
+// MetaDateDB.php
 //
-// Datenbank-Abfragen für MetaDate.class.php
+// Datenbank-Abfragen für MetaDate.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 
 
 /**
- * MetaDateDB.class.php
+ * MetaDateDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/SeminarDB.php b/lib/raumzeit/SeminarDB.php
index 63241fece80920dc31dd14774675b4bf501c8997..600510bb68a44300e40baa7ef5eb3014a75f9e23 100644
--- a/lib/raumzeit/SeminarDB.php
+++ b/lib/raumzeit/SeminarDB.php
@@ -5,9 +5,9 @@
 # Lifter010: DONE
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SeminarDB.class.php
+// SeminarDB.php
 //
-// Datenbank-Abfragen für Seminar.class.php
+// Datenbank-Abfragen für Seminar
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 
 /**
- * SeminarDB.class.php
+ * SeminarDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/SingleDate.php b/lib/raumzeit/SingleDate.php
index 2e8f41eb4784858cb9b36879bc49d0309e55fe46..06cb9a22a27cd765bc727d2f7e2de9a10aaae4e2 100644
--- a/lib/raumzeit/SingleDate.php
+++ b/lib/raumzeit/SingleDate.php
@@ -4,7 +4,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /**
- * SingelDate.class.php - Ein (Ex-)Termin
+ * SingelDate.php - Ein (Ex-)Termin
  *
  * Diese Klasse stellt einen einzelnen Eintrag in der Tabelle termine, bzw. ex_termine dar.
  *
diff --git a/lib/raumzeit/SingleDateDB.php b/lib/raumzeit/SingleDateDB.php
index e50d6cfd07e7ab6bf0cd7ab78d70cfbf80709f2d..04144a64b21ff77d38ac0bdb9d4cd305340e1586 100644
--- a/lib/raumzeit/SingleDateDB.php
+++ b/lib/raumzeit/SingleDateDB.php
@@ -4,9 +4,9 @@
 # Lifter010: DONE
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SingleDateDB.class.php
+// SingleDateDB.php
 //
-// Datenbank-Abfragen für SingleDate.class.php
+// Datenbank-Abfragen für SingleDate.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 
 
 /**
- * SingleDateDB.class.php
+ * SingleDateDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/resources/ResourceManager.php b/lib/resources/ResourceManager.php
index a30c4702b6fa6030744adca94ee4df3cb9092aed..b6115e7a4847dec405cb2430beb8d63d7048216c 100644
--- a/lib/resources/ResourceManager.php
+++ b/lib/resources/ResourceManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceManager.class.php
+ * ResourceManager.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/resources/RoomManager.php b/lib/resources/RoomManager.php
index f4b4802efc241143726283d59f7668dd0d6087ed..0122a48edf40e88e01af9c47a2d191782af8dfc3 100644
--- a/lib/resources/RoomManager.php
+++ b/lib/resources/RoomManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RoomManager.class.php
+ * RoomManager.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 66f8e65da41c75254682831651e53db82359d36f..7b7ef101472ecbb0a6630963b3ba08643e9f6e98 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -695,8 +695,8 @@ function display_exception($exception, $as_html = false, $deep = false) {
  * @return String Icon path for the mime type
  */
 //DEPRECATED: replaced by FileManager::getIconNameForMimeType
-//TODO: test: lib/extern/modules/ExternModuleDownload.class.php
-//TODO: test: lib/extern/modules/ExternModuleTemplateDownload.class.php
+//TODO: test: lib/extern/modules/ExternModuleDownload.php
+//TODO: test: lib/extern/modules/ExternModuleTemplateDownload.php
 /*
 function get_icon_for_mimetype($mime_type)
 {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 531053a4b976fd488c33140f62517573aa4542da..0aec8e85cdd9d87c04c37f70d9986da42756dc32 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -17,7 +17,7 @@ parameters:
     excludePaths:
         - lib/classes/ZipArchiveLegacyTrait.php
         - lib/elearning/studip_referrer.php
-        - lib/soap/StudipSoapClient_PHP5.class.php
+        - lib/soap/StudipSoapClient_PHP5.php
     tmpDir: .caches
     earlyTerminatingMethodCalls:
         RESTAPI\RouteMap:
diff --git a/public/admin_elearning_interface.php b/public/admin_elearning_interface.php
index f53f69c489efbbf7806ca5da1f88ef05ef928dce..24eb47c833fae1c726727662f40742795757c825 100644
--- a/public/admin_elearning_interface.php
+++ b/public/admin_elearning_interface.php
@@ -60,7 +60,7 @@ if (Config::get()->ELEARNING_INTERFACE_ENABLE)
         }
         if (!count(array_column($connection_status, 'error')))
         {
-            require_once ("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS.class.php");
+            require_once ("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS.php");
             $classname = $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS";
             $connected_cms[$cms_select] = new $classname($cms_select);
             $connected_cms[$cms_select]->initSubclasses();
diff --git a/resources/assets/javascripts/lib/wysiwyg.js b/resources/assets/javascripts/lib/wysiwyg.js
index f9acb81e01e447b8199b4da7fd0515e2ab1a41d5..47c64d06f4f5e60ab05a4c87945e428d1f45dfe1 100644
--- a/resources/assets/javascripts/lib/wysiwyg.js
+++ b/resources/assets/javascripts/lib/wysiwyg.js
@@ -13,17 +13,17 @@ const wysiwyg = {
 
     isHtml: function isHtml(text) {
         // NOTE keep this function in sync with
-        // Markup::isHtml in Markup.class.php
+        // Markup::isHtml in Markup.php
         return this.hasHtmlMarker(text);
     },
     hasHtmlMarker: function hasHtmlMarker(text) {
         // NOTE keep this function in sync with
-        // Markup::hasHtmlMarker in Markup.class.php
+        // Markup::hasHtmlMarker in Markup.php
         return this.htmlMarkerRegExp.test(text);
     },
     markAsHtml: function markAsHtml(text) {
         // NOTE keep this function in sync with
-        // Markup::markAsHtml in Markup.class.php
+        // Markup::markAsHtml in Markup.php
         if (this.hasHtmlMarker(text) || text.trim() == '') {
             return text; // marker already set, don't set twice
         }