From b1f13ce8299d581ccb889e2d98e13574bffcc5ba Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 21 Jun 2024 09:29:24 +0000
Subject: [PATCH] add remaining class filename and add migration to fix the
 cronjobs, re #4282

Merge request studip/studip!3136
---
 app/controllers/loncapa.php                   |  4 +-
 app/controllers/quicksearch.php               |  2 +-
 cli/Commands/CleanupAdmissionRules.php        |  2 +-
 cli/Commands/Plugins/PluginInfo.php           |  4 +-
 composer.json                                 |  1 -
 config/config_develop.inc.php                 |  2 +-
 db/migrations/1.128_step00240_coursesets.php  |  2 +-
 db/migrations/1.12_step_120_userpic.php       |  2 +-
 db/migrations/6.0.11_adjust_cronjobs.php      | 43 +++++++++++++++++++
 .../ConditionalAdmission.php                  |  2 +-
 .../CourseMemberAdmission.php                 |  2 +-
 .../limitedadmission/LimitedAdmission.php     |  2 +-
 .../lockedadmission/LockedAdmission.php       |  2 +-
 .../ParticipantRestrictedAdmission.php        |  2 +-
 .../passwordadmission/PasswordAdmission.php   |  2 +-
 .../PreferentialAdmission.php                 |  2 +-
 .../termsadmission/TermsAdmission.php         |  2 +-
 .../timedadmission/TimedAdmission.php         |  2 +-
 lib/calendar/CalendarColumn.php               |  2 +-
 lib/calendar/CalendarView.php                 |  2 +-
 lib/calendar/CalendarWeekView.php             |  2 +-
 lib/classes/ActionMenu.php                    |  2 +-
 lib/classes/Assets.php                        |  2 +-
 lib/classes/AuthorObject.php                  |  5 +--
 lib/classes/AutoInsert.php                    |  2 +-
 lib/classes/Color.php                         |  4 +-
 lib/classes/Config.php                        |  2 +-
 lib/classes/CourseConfig.php                  |  2 +-
 lib/classes/CronJob.php                       |  2 +-
 lib/classes/CronjobScheduler.php              |  2 +-
 lib/classes/DataFieldEntry.php                |  2 +-
 lib/classes/DatabaseObject.php                |  4 +-
 lib/classes/DateFormatter.php                 |  2 +-
 lib/classes/DbSnapshot.php                    |  2 +-
 lib/classes/DbView.php                        |  2 +-
 lib/classes/InstituteCalendarHelper.php       |  2 +-
 lib/classes/InstituteConfig.php               |  2 +-
 lib/classes/LockRules.php                     |  4 +-
 lib/classes/MVV.php                           |  2 +-
 lib/classes/Markup.php                        |  2 +-
 lib/classes/MessageBox.php                    |  2 +-
 lib/classes/ModulesNotification.php           |  4 +-
 lib/classes/MultiPersonSearch.php             |  4 +-
 lib/classes/MvvQuickSearch.php                |  2 +-
 lib/classes/NotificationCenter.php            |  2 +-
 lib/classes/QuickSearch.php                   |  6 +--
 lib/classes/RangeConfig.php                   |  2 +-
 lib/classes/RangeTreeObject.php               |  2 +-
 lib/classes/RangeTreeObjectFak.php            |  2 +-
 lib/classes/RangeTreeObjectInst.php           |  2 +-
 lib/classes/Score.php                         |  2 +-
 lib/classes/Seminar.php                       |  2 +-
 lib/classes/SeminarCategories.php             |  4 +-
 lib/classes/SessionDecoder.php                |  4 +-
 lib/classes/SimpleCollection.php              |  2 +-
 lib/classes/SimpleORMap.php                   |  2 +-
 lib/classes/SimpleORMapCollection.php         |  2 +-
 lib/classes/StudipAutoloader.php              |  2 +-
 lib/classes/StudipForm.php                    |  2 +-
 lib/classes/StudipLock.php                    |  2 +-
 lib/classes/StudipMail.php                    |  2 +-
 lib/classes/StudipObject.php                  |  4 +-
 lib/classes/StudipPDO.php                     |  2 +-
 lib/classes/StudipRangeTree.php               |  2 +-
 lib/classes/StudipRangeTreeView.php           |  2 +-
 lib/classes/StudipRangeTreeViewAdmin.php      |  2 +-
 lib/classes/StudipSemRangeTreeViewSimple.php  |  2 +-
 lib/classes/StudipSemSearch.php               |  2 +-
 lib/classes/StudipSemSearchHelper.php         |  2 +-
 lib/classes/StudipSemTreeSearch.php           |  2 +-
 lib/classes/StudipSemTreeView.php             |  2 +-
 lib/classes/StudipSemTreeViewAdmin.php        |  2 +-
 lib/classes/StudipSemTreeViewSimple.php       |  2 +-
 lib/classes/TreeAbstract.php                  |  2 +-
 lib/classes/TreeView.php                      |  8 ++--
 lib/classes/UserConfig.php                    |  2 +-
 lib/classes/UserLookup.php                    |  2 +-
 lib/classes/UserManagement.php                |  4 +-
 lib/classes/admission/AdmissionAlgorithm.php  |  4 +-
 lib/classes/admission/AdmissionPriority.php   |  2 +-
 lib/classes/admission/AdmissionRule.php       |  2 +-
 lib/classes/admission/AdmissionUserList.php   |  2 +-
 lib/classes/admission/CourseSet.php           |  2 +-
 lib/classes/admission/RandomAlgorithm.php     |  2 +-
 lib/classes/admission/UserFilter.php          |  2 +-
 lib/classes/admission/UserFilterField.php     |  7 ++-
 .../userfilter/DatafieldCondition.php         |  2 +-
 .../admission/userfilter/DegreeCondition.php  |  2 +-
 .../userfilter/PermissionCondition.php        |  2 +-
 .../userfilter/SemesterOfStudyCondition.php   |  2 +-
 .../userfilter/StgteilVersionCondition.php    |  2 +-
 .../admission/userfilter/SubjectCondition.php |  2 +-
 .../userfilter/SubjectConditionAny.php        |  4 +-
 .../auth_plugins/StudipAuthAbstract.php       |  2 +-
 lib/classes/auth_plugins/StudipAuthIP.php     |  2 +-
 lib/classes/auth_plugins/StudipAuthLTI.php    |  2 +-
 lib/classes/auth_plugins/StudipAuthLdap.php   |  2 +-
 .../StudipAuthLdapReadAndBind.php             |  2 +-
 lib/classes/auth_plugins/StudipAuthOIDC.php   |  2 +-
 lib/classes/auth_plugins/StudipAuthSSO.php    |  2 +-
 lib/classes/auth_plugins/StudipAuthShib.php   |  2 +-
 .../auth_plugins/StudipAuthStandard.php       |  2 +-
 lib/classes/cache/Exception.php               |  2 +-
 .../cache/InvalidCacheArgumentException.php   |  2 +-
 lib/classes/cache/Item.php                    |  2 +-
 lib/classes/calendar/ICalendarExport.php      |  2 +-
 .../coursewizardsteps/LVGroupsWizardStep.php  |  2 +-
 lib/classes/exportdocument/ExportPDF.php      |  2 +-
 lib/classes/searchtypes/MyCoursesSearch.php   |  2 +-
 lib/classes/searchtypes/PermissionSearch.php  |  2 +-
 lib/classes/searchtypes/ResourceSearch.php    |  2 +-
 lib/classes/searchtypes/RoomSearch.php        |  2 +-
 lib/classes/searchtypes/SQLSearch.php         |  4 +-
 lib/classes/searchtypes/SearchType.php        |  3 +-
 lib/classes/searchtypes/SeminarSearch.php     |  2 +-
 lib/classes/searchtypes/StandardSearch.php    |  4 +-
 lib/classes/searchtypes/TreeSearch.php        |  2 +-
 lib/cronjobs/check_admission.php              |  4 +-
 lib/cronjobs/cleanup_log.php                  |  4 +-
 lib/cronjobs/garbage_collector.php            |  4 +-
 lib/cronjobs/purge_cache.php                  |  8 ++--
 lib/cronjobs/remind_oer_upload.php            |  4 +-
 lib/cronjobs/send_mail_queue.php              |  2 +-
 lib/cronjobs/session_gc.php                   |  2 +-
 lib/dbviews/range_tree.view.php               |  2 +-
 lib/dbviews/sem_tree.view.php                 |  2 +-
 lib/elearning/ConnectedCMS.php                | 20 ++++-----
 lib/elearning/ELearningUtils.php              |  2 +-
 lib/elearning/Ilias3ConnectedCMS.php          |  2 +-
 lib/elearning/PmWikiConnectedCMS.php          |  2 +-
 lib/elearning/PmWikiConnectedLink.php         |  2 +-
 lib/elearning/PmWikiContentModule.php         |  2 +-
 lib/exceptions/ClipboardException.php         |  2 +-
 lib/exceptions/StudipException.php            |  2 +-
 .../resources/GlobalResourceLockException.php |  2 +-
 .../GlobalResourceLockOverlapException.php    |  2 +-
 .../InvalidResourceCategoryException.php      |  2 +-
 .../InvalidResourceClassException.php         |  2 +-
 .../resources/InvalidResourceException.php    |  2 +-
 .../InvalidResourceRequestException.php       |  2 +-
 .../resources/ResourceBookingException.php    |  2 +-
 .../ResourceBookingOverlapException.php       |  2 +-
 .../ResourceBookingRangeException.php         |  2 +-
 .../resources/ResourceException.php           |  2 +-
 .../ResourceNoTimeRangeException.php          |  2 +-
 .../resources/ResourcePermissionException.php |  2 +-
 .../ResourcePropertyDefinitionException.php   |  2 +-
 .../resources/ResourcePropertyException.php   |  2 +-
 .../ResourcePropertyStateException.php        |  2 +-
 .../resources/ResourceRequestException.php    |  2 +-
 .../ResourceUnavailableException.php          |  2 +-
 .../resources/ResourceUnlockableException.php |  2 +-
 .../resources/SeparableRoomException.php      |  2 +-
 lib/filesystem/FileArchiveManager.php         |  2 +-
 lib/filesystem/HomeworkFolder.php             |  2 +-
 lib/filesystem/InboxFolder.php                |  2 +-
 lib/filesystem/InboxOutboxFolder.php          |  2 +-
 lib/filesystem/MessageFolder.php              |  2 +-
 lib/filesystem/OutboxFolder.php               |  2 +-
 lib/models/AdmissionApplication.php           |  2 +-
 lib/models/ArchivedCourse.php                 |  2 +-
 lib/models/ArchivedCourseMember.php           |  2 +-
 lib/models/AuthUserMd5.php                    |  2 +-
 lib/models/BannerRoles.php                    |  2 +-
 lib/models/Clipboard.php                      |  2 +-
 lib/models/ClipboardItem.php                  |  2 +-
 lib/models/ColourValue.php                    |  2 +-
 lib/models/ConfigEntry.php                    |  2 +-
 lib/models/Contact.php                        |  2 +-
 lib/models/ContentTermsOfUse.php              |  2 +-
 lib/models/Course.php                         |  2 +-
 lib/models/CourseMember.php                   |  2 +-
 lib/models/CourseMemberNotification.php       |  2 +-
 lib/models/Courseware/BlockTypes/Text.php     |  2 -
 lib/models/CronjobLog.php                     |  2 +-
 lib/models/CronjobSchedule.php                |  2 +-
 lib/models/CronjobTask.php                    |  2 +-
 lib/models/Degree.php                         |  2 +-
 lib/models/Deputy.php                         |  2 +-
 lib/models/HelpContent.php                    |  2 +-
 lib/models/HelpTour.php                       |  2 +-
 lib/models/HelpTourAudience.php               |  2 +-
 lib/models/HelpTourSettings.php               |  2 +-
 lib/models/HelpTourStep.php                   |  3 +-
 lib/models/HelpTourUser.php                   |  2 +-
 lib/models/Institute.php                      |  2 +-
 lib/models/LockRule.php                       |  2 +-
 lib/models/LoginBackground.php                |  2 +-
 lib/models/LoginFaq.php                       |  2 +-
 lib/models/Message.php                        |  2 +-
 lib/models/MessageUser.php                    |  2 +-
 lib/models/MvvOverlappingConflict.php         |  2 +-
 lib/models/MvvOverlappingExclude.php          |  3 +-
 lib/models/MvvOverlappingSelection.php        |  2 +-
 lib/models/NewsRange.php                      |  2 +-
 lib/models/NewsRoles.php                      |  2 +-
 lib/models/Semester.php                       |  2 +-
 lib/models/SemesterCourse.php                 |  2 +-
 lib/models/SemesterHoliday.php                |  2 +-
 lib/models/SeminarCycleDate.php               |  2 +-
 lib/models/StudipComment.php                  |  2 +-
 lib/models/StudipNews.php                     |  2 +-
 lib/models/StudipScmEntry.php                 |  2 +-
 lib/models/StudyCourse.php                    |  2 +-
 lib/models/ToolActivation.php                 |  2 +-
 lib/models/User.php                           |  4 +-
 lib/models/UserInfo.php                       |  2 +-
 lib/models/UserOnline.php                     |  4 +-
 lib/models/UserStudyCourse.php                |  2 +-
 lib/models/WebserviceAccessRule.php           |  2 +-
 lib/models/WikiPage.php                       |  2 +-
 lib/models/calendar/CalendarDate.php          |  2 +-
 .../calendar/CalendarDateAssignment.php       |  2 +-
 lib/models/resources/BrokenResource.php       |  2 +-
 lib/models/resources/Building.php             |  2 +-
 lib/models/resources/GlobalResourceLock.php   |  2 +-
 lib/models/resources/Location.php             |  2 +-
 lib/models/resources/Resource.php             |  2 +-
 lib/models/resources/ResourceBooking.php      |  2 +-
 .../resources/ResourceBookingInterval.php     |  2 +-
 lib/models/resources/ResourceCategory.php     |  2 +-
 .../resources/ResourceCategoryProperty.php    |  2 +-
 lib/models/resources/ResourceLabel.php        |  2 +-
 lib/models/resources/ResourcePermission.php   |  2 +-
 lib/models/resources/ResourceProperty.php     |  2 +-
 .../resources/ResourcePropertyDefinition.php  |  2 +-
 .../resources/ResourcePropertyGroup.php       |  2 +-
 lib/models/resources/ResourceRequest.php      |  2 +-
 .../resources/ResourceRequestAppointment.php  |  2 +-
 .../resources/ResourceRequestProperty.php     |  2 +-
 .../resources/ResourceTemporaryPermission.php |  2 +-
 lib/models/resources/Room.php                 |  2 +-
 lib/models/resources/RoomRequest.php          |  2 +-
 lib/models/resources/SeparableRoom.php        |  2 +-
 lib/models/resources/SeparableRoomPart.php    |  2 +-
 lib/modules/CoreForum.php                     |  2 +-
 lib/modules/FeedbackModule.php                |  2 +-
 lib/modules/GradebookModule.php               |  2 +-
 lib/modules/LtiToolModule.php                 |  2 +-
 lib/object.inc.php                            |  4 +-
 lib/phplib/Seminar_Auth.php                   |  2 +-
 lib/phplib/Seminar_Default_Auth.php           |  4 +-
 lib/phplib/Seminar_Perm.php                   |  2 +-
 lib/phplib/Seminar_Register_Auth.php          |  2 +-
 lib/phplib/Seminar_User.php                   |  2 +-
 lib/plugins/core/AdministrationPlugin.php     |  2 +-
 lib/plugins/core/CorePlugin.php               |  2 +-
 lib/plugins/core/DetailspagePlugin.php        |  2 +-
 lib/plugins/core/ForumModule.php              |  4 +-
 lib/plugins/core/HomepagePlugin.php           |  2 +-
 lib/plugins/core/LibraryPlugin.php            |  2 +-
 lib/plugins/core/PortalPlugin.php             |  2 +-
 lib/plugins/core/Role.php                     |  2 +-
 lib/plugins/core/StandardPlugin.php           |  2 +-
 lib/plugins/core/StudIPPlugin.php             |  2 +-
 lib/plugins/core/SystemPlugin.php             |  2 +-
 lib/plugins/db/RolePersistence.php            |  2 +-
 lib/plugins/engine/PluginManager.php          |  6 +--
 lib/plugins/engine/PluginRepository.php       |  2 +-
 lib/raumzeit/CycleData.php                    |  2 +-
 lib/raumzeit/CycleDataDB.php                  |  6 +--
 lib/raumzeit/Issue.php                        |  6 +--
 lib/raumzeit/IssueDB.php                      |  6 +--
 lib/raumzeit/MetaDate.php                     |  4 +-
 lib/raumzeit/MetaDateDB.php                   |  6 +--
 lib/raumzeit/SeminarDB.php                    |  6 +--
 lib/raumzeit/SingleDate.php                   |  2 +-
 lib/raumzeit/SingleDateDB.php                 |  6 +--
 lib/resources/ResourceManager.php             |  2 +-
 lib/resources/RoomManager.php                 |  2 +-
 lib/visual.inc.php                            |  4 +-
 phpstan.neon.dist                             |  2 +-
 public/admin_elearning_interface.php          |  2 +-
 resources/assets/javascripts/lib/wysiwyg.js   |  6 +--
 274 files changed, 375 insertions(+), 342 deletions(-)
 create mode 100644 db/migrations/6.0.11_adjust_cronjobs.php

diff --git a/app/controllers/loncapa.php b/app/controllers/loncapa.php
index 41331b649a6..dd7ea4085b7 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 9c6a4ae67c2..c0864987101 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 3079ae4c3ec..a7036d3cef9 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 9809b138aa9..c8f97483b1d 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 dfb4fe19fd9..920069f8daf 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 a38726a6c24..655fd4b0a9f 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 b767ae3acac..2f47805a82a 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 f907b9ff9fa..eeb787abcb3 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 00000000000..132885eb399
--- /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 7fdbc00429e..640e8006014 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 a3309e84cfa..139c36040bd 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 a193bda823a..d7f53c15017 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 0ca324b41f9..92ef5137e40 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 28a910dab8c..586f82f6ef7 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 06506306ccc..871502113d3 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 9c90f69d330..2f57a446622 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 1d421adadf7..eb83dfcc2d0 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 e167bd83fe6..5f5e88570c4 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 cc3abea5310..78a38090e6d 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 3d89ef19261..9d9ebc29556 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 c1e0f24718f..1d14ca2188f 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 0822f721163..25351ce5ac3 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 928c47c3e36..d4d792e64b7 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 b3e98e3a8ef..f08622e3625 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 b2168ccfbe6..b5cc00553c9 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 a9b4506bc20..dcd68f55fcf 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 642665db5f5..c49a8455afa 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 ad62be08765..3ac55875f1f 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 1e7fb412123..dee65e7327b 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 cc4cf8b0201..fbb5b66f82e 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 fd50a0bb673..eca0b4ae262 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 2258adb4eb6..5c542291541 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 5f7c558321e..5309cbc92db 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 dfb4f896686..33ea6600a38 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 81e9b9112d1..0215f8ed729 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 4302cf10168..6c934b4968b 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 d1a51cb8adf..551ea4d496a 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 59679db6258..f1feb9ff0c0 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 517514c289c..b4d9edf6eec 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 fbde67b07bf..dc6820f489f 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 8936ebec087..3573018d2e6 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 f41407140b1..1dc361c1f38 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 af10e6be869..3ca617bfed2 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 b0e79c03b99..b06de4f62ec 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 aaaa9e8f3f0..178fd62f0f7 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 d3983a33bc7..f3e18cc27ea 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 b1030e39615..ad482077855 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 579db435989..06f84bf714e 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 76cc366572d..9e980cac6a1 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 c291dfc7a24..d41b03d088c 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 4d114d5d4b5..3b7f1490637 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 a2d69eaf094..0fccdbce645 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 5302f1e3dcf..25eb4c10abe 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 d437494cf9c..fc40c076e77 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 6acc10d4d40..ae773f5b581 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 7124cc40192..7492906519b 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 7debb80eaad..20162e5613d 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 7054478d442..883adc725fc 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 024e2e3e578..12029df193b 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 601db8b10ac..ce5752f5a6b 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 4974f660260..c5178474ec8 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 151fcdb8597..5f10c86af60 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 8a1422b1a8e..77046f7e796 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 cf88d231cf0..5e1aefee151 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 2532e4b6308..7b230891df8 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 06209578176..1c5e5a1d109 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 eecdd70cd1f..78b5ccfe044 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 8932dd12500..6d86b444f4d 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 29ee5d37a18..d2218693302 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 e79a34fa29e..0d8f9355d5a 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 3e984cc8313..f2d6fbecf67 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 edc65c8b3a7..59c926adfd0 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 e2dba760203..239275b0430 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 ccdb6e11760..a1413b3f11b 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 243a9b9e631..0bc2810355d 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 4cb1ff6a190..413d4c853f3 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 bdd9fc368c0..62de8fd4eb8 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 015e6cd491a..4bd47ec1cd1 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 7e9df92117e..fae10610117 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 47e156478c5..22d426e54e8 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 fe5e5bbf39a..2b826e49ac4 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 570bc62b697..3e5a43099fb 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 d94bc057a9a..cf876673671 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 54d44d7f840..4666f594d06 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 d380ef0c0b5..692422f5357 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 9081e9015bd..4b5132207cf 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 966fe8eb9b6..1bc93e8b775 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 9180e2d39f2..61ce456d0c4 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 4adfdbfb50f..fe9458c6f3a 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 2c1233a05a5..5794f759e1e 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 f6348e50587..ec5c1f38033 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 ab44d491190..7aa5f26cc36 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 107c86ce29e..3a3712ba040 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 36c75df646f..19d5afa73ad 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 e0d6afa3215..dd42a287f61 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 07ab8c378c9..d5a286334f2 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 7cb86860028..6bbd3fd43ce 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 742f0cba4a6..3acb1d8ca39 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 adfe9c9a4b0..b26c17b0f94 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 752fa59a1b4..dd6af11387b 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 3eedc65c760..135b3f6f878 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 5bb3e65f0db..927a13cb9a6 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 64ee3640873..061d09019a2 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 e85c6b2c138..a201cad983e 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 4e83d4ddceb..99a6df81bf6 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 00147efcf6e..d8d1af7d8ce 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 e79e1bde1de..c651714cf19 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 915cfdeaab8..f676c4516c8 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 64bee64cb7e..1bdb25086be 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 cc4ce3ebafe..3f862716d59 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 24038a84b4e..f664bebcd70 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 002712e3c31..877c2cb13eb 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 86aff6dcbf0..de4efa3aa45 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 d46d57e6af3..b4f9b685c17 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 e4902289314..fd7bf8a090e 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 837a849c866..a3f0f3b5474 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 2fecf60e0cd..73d423935aa 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 dfd493cfbb8..1be4c093f77 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 378a6ecedab..e88f8036b64 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 bab44b287e7..eba57fca69d 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 d2e3697db8d..2e253e1e3b5 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 a1a8ee1984c..528d789e0f9 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 8f729187ea6..f9cdd941c51 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 4289a29ea08..54763ee0c4f 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 8d3af86fdb4..913330dcf76 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 008ee933b0c..8980e718c11 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 3dd3bfba262..f5617e83264 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 33fb4a24a99..806cff91168 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 3e428ff2b72..759880afc92 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 7de0a788e73..d89012699b6 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 8ed741660fd..973c272d575 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 06533dda93f..fb3cccd9715 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 676da939034..1c801752940 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 e9bbf3d9140..369ba6fce74 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 165843feebe..d12c2d8a803 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 6b05cf5e015..b73a89786e3 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 df4d36cc7ee..f2b1fe985da 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 8420a83982a..2c1f033dcf3 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 e9850b80bdc..de61d2408c4 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 8ec9dab1566..8ee48b39520 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 c1db11c0c6c..3dcf4834b8a 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 f59cc39179f..697cfc5746c 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 50e71449c17..48e04a26621 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 686cc33cecc..3f7a5adeea9 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 891b583b103..f1c5f2c51b9 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 3a0c919be79..add73858a56 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 963ca64277b..5b96dd9c66a 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 83f871f7467..917c3b0753e 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 1880265d526..b93d6da1577 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 1e8d07130ba..ffd238cde7b 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 b335d143130..86f33c7a9e0 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 11bc92bd2c4..968729f6ad8 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 78c99126498..91a8c10a3d5 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 704bb44c283..aded83c56a4 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 fb93ef8147c..f46b4a0673d 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 428bea53399..d692158b56d 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 6a8f2fd1581..33ba6d2eac2 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 2e5c3afbc25..2dfef0c0b99 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 22170d5e2dc..548725882c2 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 02514ec8184..7e8c3f56286 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 81879af2bf6..f3b2de8fcfc 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 1febd354070..e54de91c2ae 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 48e27f8462a..d8b7c53ef36 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 d1c29865317..a460986f861 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 cd8fe89a994..01282cc135e 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 888250f16e3..a19eeafcce9 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 6ae05ad2706..486de456795 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 5e06da8a8ab..dd0efa41272 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 16bff26611c..bea5b95cc5d 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 fb2e592cf68..1982dd6c56a 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 bfea7a0530c..d8bb2f5779a 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 cd7555f35b6..7c4b335c57c 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 e72ba762be2..5e1b544e6e0 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 917efb3dfe4..1da7cbe2b4d 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 c9e92f796dc..278a515dc8e 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 0eb19ba8ea6..08a18d3c0e6 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 8a56ca0ad91..1304bc1ee1d 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 6fef8342b48..9c908d3314a 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 e2917e7a018..c74c7413e49 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 f1e61b1a3c6..e9a6f476bbd 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 68bd8307ba1..978e2038df8 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 6255a465d25..f341196b7aa 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 f24c86b276e..1cac957adeb 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 6f3132639fe..3bd5ad8aa24 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 aa2869d1485..49922250f13 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 47cf27180f5..df344ff2873 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 a3ef2713c3b..83dec60c9eb 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 3ede27551fe..530ae422852 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 d6cad4077f2..4c049ac4c38 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 46493d62165..fb6b78eff23 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 0ae6dd5cfef..1715de1e822 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 6ac8e298648..54b367fee8f 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 d199e3040b5..6cde4148bc0 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 9d159e2d6f9..b3fcc15a701 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 77852145abe..675478f5ce0 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 56da6ec6017..28a40646d5d 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 03243a57d04..ef3246b8c66 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 04590e34ae4..79e52301cde 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 90f9ecd3f3f..265f8e1b23b 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 f3844268954..b8431a3fd41 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 2e0389d5310..79610f854d1 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 12eb3e13d84..ccb1828cdda 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 7001a4a29ad..30c13d30213 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 faf6df46ff7..91937ea0362 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 a4a4de24e37..4209a20ff23 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 4894031b7ca..3fcc3f5383e 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 28808a22ce5..62a63fc5aa6 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 e18322dd523..c3efba2b15b 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 cac37c89ead..aeac38bd058 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 48da0efbbe0..120ac471ed3 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 67ddd7e6374..b5f0101338c 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 d901cf18b21..0318dab5ef8 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 e0bf467fe86..e0e2135452d 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 5266b4f1430..fc44e821306 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 0edb98393a1..a1c071a095a 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 b1753f5e9e7..ed748e138b1 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 8e793821622..9da2e113703 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 92d810773bd..32fce2b5926 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 89507139d21..977cf32ec49 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 7908e4076e6..47f01cc0ea8 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 766a5f61f97..cfe323a54df 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 b1460cdaa71..c9ac66ee216 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 d9c869f605d..c46572396a1 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 bd337088c90..044db839837 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 4bbc4ec2546..4f7a3299bc4 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 450ec001e12..b87e8e6dd66 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 ad539022a8c..f6ea82528a8 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 b2f5524f02a..df77b19ff0d 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 929733bdc85..63384a200c0 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 2952be9ba35..c387daa59c3 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 ddbc397c3e4..ad7b33a0773 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 7f1668e441f..c8e393cb927 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 6db9c38fb6a..4ba11bce53b 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 9ec1ccfeae3..d1bf125bd4e 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 e7e99e7249c..8a45ce7163f 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 3a43372c204..0283a09df03 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 8674f62687b..2fc657d3d6d 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 66886a243d5..45cd93edc6b 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 033f5e80c8b..74fd70aa8e1 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 c23efa45380..a8bd5d7bce9 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 2c1c60c3b92..950be8a0947 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 6d0e46c902f..146c5888be4 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 a116938f8a7..1c3a85e95f3 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 f2a272e16ae..5bf10f18846 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 c82d73a4d26..4dd59bc2039 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 c9aa8da0c8e..6856e6a9352 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 d059f4cca47..056efaf6ac1 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 36e6efa9d7e..3cc3b57a01b 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 33784db9594..e72ffc26397 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 37efb54e66e..b0dbd6510ed 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 a7fb87313c9..3c1a7516cb9 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 cb5aca43462..826e410764e 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 3ca8a11e378..91e00e852dc 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 960ffd0f3be..518089119b5 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 fe74259dcff..6642dbdc989 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 c204567f720..0ffd16f01ea 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 df63a773deb..54a0053941e 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 7e36fa0ae4a..ec434a95ff5 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 235e9bd97b3..4bd24c6dfe1 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 587e0bc7f5f..d89d8aeb17f 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 eb586b41929..715df0b3f08 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 939aaeecc43..eeb38b3922d 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 d6c0ba34450..17d8b95e000 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 0af632d0f09..13482228807 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 5f5e1dfda4c..29af00ec1c5 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 63241fece80..600510bb68a 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 2e8f41eb478..06cb9a22a27 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 e50d6cfd07e..04144a64b21 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 a30c4702b6f..b6115e7a484 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 f4b4802efc2..0122a48edf4 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 66f8e65da41..7b7ef101472 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 531053a4b97..0aec8e85cdd 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 f53f69c489e..24eb47c833f 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 f9acb81e01e..47c64d06f4f 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
         }
-- 
GitLab