add remaining class filename and add migration to fix the cronjobs, re #4282

Merge request studip/studip!3136

76 files changed, 77 insertions, 81 deletions

diff --git a/lib/models/AdmissionApplication.php b/lib/models/AdmissionApplication.php
index 02514ec..7e8c3f5 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 81879af..f3b2de8 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 1febd35..e54de91 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 48e27f8..d8b7c53 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 d1c2986..a460986 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 cd8fe89..01282cc 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 888250f..a19eeaf 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 6ae05ad..486de45 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 5e06da8..dd0efa4 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 16bff26..bea5b95 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 fb2e592..1982dd6 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 bfea7a0..d8bb2f5 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 cd7555f..7c4b335 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 e72ba76..5e1b544 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 917efb3..1da7cbe 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 c9e92f7..278a515 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 0eb19ba..08a18d3 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 8a56ca0..1304bc1 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 6fef834..9c908d3 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 e2917e7..c74c741 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 f1e61b1..e9a6f47 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 68bd830..978e203 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 6255a46..f341196 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 f24c86b..1cac957 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 6f31326..3bd5ad8 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 aa2869d..4992225 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 47cf271..df344ff 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 a3ef271..83dec60 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 3ede275..530ae42 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 d6cad40..4c049ac 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 46493d6..fb6b78e 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 0ae6dd5..1715de1 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 6ac8e29..54b367f 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 d199e30..6cde414 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 9d159e2..b3fcc15 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 7785214..675478f 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 56da6ec..28a4064 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 03243a5..ef3246b 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 04590e3..79e5230 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 90f9ecd..265f8e1 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 f384426..b8431a3 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 2e0389d..79610f8 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 12eb3e1..ccb1828 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 7001a4a..30c13d3 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 faf6df4..91937ea 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 a4a4de2..4209a20 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 4894031..3fcc3f5 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 28808a2..62a63fc 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 e18322d..c3efba2 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 cac37c8..aeac38b 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 48da0ef..120ac47 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 67ddd7e..b5f0101 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 d901cf1..0318dab 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 e0bf467..e0e2135 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 5266b4f..fc44e82 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 0edb983..a1c071a 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 b1753f5..ed748e1 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 8e79382..9da2e11 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 92d8107..32fce2b 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 8950713..977cf32 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 7908e40..47f01cc 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 766a5f6..cfe323a 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 b1460cd..c9ac66e 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 d9c869f..c465723 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 bd33708..044db83 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 4bbc4ec..4f7a329 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 450ec00..b87e8e6 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 ad53902..f6ea825 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 b2f5524..df77b19 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 929733b..63384a2 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 2952be9..c387daa 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 ddbc397..ad7b33a 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 7f1668e..c8e393c 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 6db9c38..4ba11bc 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 9ec1ccf..d1bf125 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 e7e99e7..8a45ce7 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