diff --git a/app/controllers/api/authorizations.php b/app/controllers/api/authorizations.php
index 52a29e1b4f0593cfc3ca491c8a0fdcc606a66df9..543bc7951cb7a4fb6b8c6ac12eb435b8ad0888a4 100644
--- a/app/controllers/api/authorizations.php
+++ b/app/controllers/api/authorizations.php
@@ -3,7 +3,7 @@
 require_once 'lib/bootstrap-api.php';
 
 /**
-* @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+* @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  **/
 class Api_AuthorizationsController extends AuthenticatedController
 {
diff --git a/app/controllers/api/oauth.php b/app/controllers/api/oauth.php
index 22caab1bc7fbcbb19544c3acae6004069ebdbf88..830f0b31b6f0a7500b27f019bf185af340b14bb7 100644
--- a/app/controllers/api/oauth.php
+++ b/app/controllers/api/oauth.php
@@ -3,7 +3,7 @@
 require_once 'lib/bootstrap-api.php';
 
 /**
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  **/
 class Api_OauthController extends StudipController
 {
diff --git a/app/routes/Activity.php b/app/routes/Activity.php
index d67578418ffff1afafdc7c5f7cf79c598be52415..fadca0f148ce437efccce413a51d23abf092832d 100644
--- a/app/routes/Activity.php
+++ b/app/routes/Activity.php
@@ -5,7 +5,7 @@ namespace RESTAPI\Routes;
  * @author      Till Glöggler <tgloeggl@uos.de>
  * @author      André Klaßen <klassen@elan-ev.de>
  * @license     GPL 2 or later
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition user_id ^[a-f0-9]{1,32}$
  */
diff --git a/app/routes/Blubber.php b/app/routes/Blubber.php
index 4fb6ab9d87ec4adf46e149e5080c271b639b4e46..14450887b707bf169cc01db68f842f2b1565dd1f 100644
--- a/app/routes/Blubber.php
+++ b/app/routes/Blubber.php
@@ -3,7 +3,7 @@ namespace RESTAPI\Routes;
 
 /**
  * @license GPL 2 or later
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition course_id ^[a-f0-9]{1,32}$
  * @condition stream_id ^(global|[a-f0-9]{1,32})$
diff --git a/app/routes/Clipboard.php b/app/routes/Clipboard.php
index 2f630dc78cc48cab53ef4da895db073b0546c525..dfe22e0acf696c532f98de63d568a02828187089 100644
--- a/app/routes/Clipboard.php
+++ b/app/routes/Clipboard.php
@@ -9,7 +9,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Clipboard extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/Contacts.php b/app/routes/Contacts.php
index 898bc013f6858e34610f25056aae8b7a185b2bf2..d7fd01040bb9b79d6f6fd35598ea647553caa9d1 100644
--- a/app/routes/Contacts.php
+++ b/app/routes/Contacts.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 /**
  * @author  <mlunzena@uos.de>
  * @license GPL 2 or later
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition user_id ^[a-f0-9]{1,32}$
  * @condition friend_id ^[a-f0-9]{1,32}$
diff --git a/app/routes/Course.php b/app/routes/Course.php
index bb2f32ff3e06dc0178366c6a6ea529b74152fdcb..d1fad96d0fe50a6a2bba5a5ad9ee4ca4c96650d1 100644
--- a/app/routes/Course.php
+++ b/app/routes/Course.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 /**
  * @author  <mlunzena@uos.de>
  * @license GPL 2 or later
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition course_id ^[a-f0-9]{1,32}$
  * @condition user_id ^[a-f0-9]{1,32}$
diff --git a/app/routes/Discovery.php b/app/routes/Discovery.php
index 1c84d588ee4a200b53dd58bbf65c60aca3cabe81..c83f524125e1130aa1e8cc0ab0837760d9016a35 100644
--- a/app/routes/Discovery.php
+++ b/app/routes/Discovery.php
@@ -5,7 +5,7 @@ namespace RESTAPI\Routes;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Discovery extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/Events.php b/app/routes/Events.php
index 0302826804612e48482192489710532cf4c7072f..c07c6e69ca5f353b88399493736cfb7e27126b57 100644
--- a/app/routes/Events.php
+++ b/app/routes/Events.php
@@ -15,7 +15,7 @@ use CalendarWriterICalendar;
  * @author     André Klaßen <andre.klassen@elan-ev.de>
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition course_id ^[a-f0-9]{1,32}$
  * @condition user_id ^[a-f0-9]{1,32}$
diff --git a/app/routes/Feedback.php b/app/routes/Feedback.php
index 52bbac70ef9dd7643c04b2b9935a8a887a25f12c..9a2834779742d06813e8ba496928eecc0c1edd88 100644
--- a/app/routes/Feedback.php
+++ b/app/routes/Feedback.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 
 /**
  * @author     Nils Gehrke <nils.gehrke@uni-goettingen.de>
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition feedback_id ^\d*$
  * @condition course_id ^[a-f0-9]{32}$
diff --git a/app/routes/FileSystem.php b/app/routes/FileSystem.php
index 54e2851f01fef0690298def4f00df6cfb598e65b..9abd7132692a8118f55b00b626b9f643e4f40bcd 100644
--- a/app/routes/FileSystem.php
+++ b/app/routes/FileSystem.php
@@ -6,7 +6,7 @@ namespace RESTAPI\Routes;
  *
  * @author     Moritz Strohm <strohm@data-quest.de>
  * @license    GNU General Public License Version 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * Partially based upon the Files.php source code from Jan-Hendrik Willms
  * (tleilax+studip@gmail.com) and mluzena@uos.de which is also
diff --git a/app/routes/Forum.php b/app/routes/Forum.php
index d5fd341b6ca983f0bf889edfd13acbbd4d63af3b..35aad913afebbddb191db1a0bd91b12bf926a041 100644
--- a/app/routes/Forum.php
+++ b/app/routes/Forum.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 /**
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition course_id ^[a-f0-9]{1,32}$
  */
diff --git a/app/routes/Messages.php b/app/routes/Messages.php
index 07c57389656d608068476f5b027e7a280bae0e0e..db9cb2e9f3cca5a6fc0c2ec0f5efa258356c350c 100644
--- a/app/routes/Messages.php
+++ b/app/routes/Messages.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 /**
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition message_id ^[a-f0-9]{1,32}$
  * @condition user_id ^[a-f0-9]{1,32}$
diff --git a/app/routes/News.php b/app/routes/News.php
index 5f9ddc2126a1d612e61841667c929f0fe9234978..c9b258baf968bf0c19539582a5257ddd9be72623 100644
--- a/app/routes/News.php
+++ b/app/routes/News.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 /**
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition news_id ^[0-9a-f]{1,32}$
  * @condition course_id ^[0-9a-f]{1,32}$
diff --git a/app/routes/ResourceBooking.php b/app/routes/ResourceBooking.php
index 77b1e848d9ab125ff0d22a7fe0caa27957b7aab6..a5d027f44b23912791820e7c6e1c5572d28f1e0c 100644
--- a/app/routes/ResourceBooking.php
+++ b/app/routes/ResourceBooking.php
@@ -9,7 +9,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class ResourceBooking extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/ResourceCategories.php b/app/routes/ResourceCategories.php
index 70ca7700f2b6dba993945a9428551f61fe5b6a2c..bdd3d15a855a7b568cc66799cfdfede096d3da54 100644
--- a/app/routes/ResourceCategories.php
+++ b/app/routes/ResourceCategories.php
@@ -8,7 +8,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class ResourceCategories extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/ResourcePermissions.php b/app/routes/ResourcePermissions.php
index d69dceac00031a68bfb353fc7bbb3b5eb3f2f389..be5c6477242da221e0f4bd87f8f301a663fc23e3 100644
--- a/app/routes/ResourcePermissions.php
+++ b/app/routes/ResourcePermissions.php
@@ -9,7 +9,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class ResourcePermissions extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/ResourceProperties.php b/app/routes/ResourceProperties.php
index 8f00d0a18f78e244e0178a8bc95e6433c73bae05..2ddbbaf74ea5f3082444020b5ebacca521ee938e 100644
--- a/app/routes/ResourceProperties.php
+++ b/app/routes/ResourceProperties.php
@@ -8,7 +8,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class ResourceProperties extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/ResourceRequest.php b/app/routes/ResourceRequest.php
index b3d235d0a5b30546804a86e0d7b1e2a276d6ed9c..24dfd2efb781e1d6d782fa93a3d864017b4b00f9 100644
--- a/app/routes/ResourceRequest.php
+++ b/app/routes/ResourceRequest.php
@@ -9,7 +9,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class ResourceRequest extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/Resources.php b/app/routes/Resources.php
index b2113b1b65bd4699cc4079055ef7c65209727955..53a9c084b869b7b19387c649746d964bd29facc5 100644
--- a/app/routes/Resources.php
+++ b/app/routes/Resources.php
@@ -9,7 +9,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Resources extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/RoomClipboard.php b/app/routes/RoomClipboard.php
index cfb9f2e38b34431fb158ea7f259f2cade858b49c..ffcafe6b23ab8d880aeb6041c7c8f372231398ad 100644
--- a/app/routes/RoomClipboard.php
+++ b/app/routes/RoomClipboard.php
@@ -9,7 +9,7 @@ namespace RESTAPI\Routes;
  * @copyright   2017-2019
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class RoomClipboard extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/Schedule.php b/app/routes/Schedule.php
index f394313216aab6c4f900ace02cd98258efdd863f..2341f7384806ab5501c1a764a8691dd2c6301e6e 100644
--- a/app/routes/Schedule.php
+++ b/app/routes/Schedule.php
@@ -5,7 +5,7 @@ namespace RESTAPI\Routes;
  * @author     André Klaßen <andre.klassen@elan-ev.de>
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition user_id ^[a-f0-9]{1,32}$
  * @condition semester_id ^[a-f0-9]{1,32}$
diff --git a/app/routes/Semester.php b/app/routes/Semester.php
index 401d7e7c66eab2dee695e5510fbf1fcb3fae70b9..809228266537b2b51b485167913838f307e0e9a9 100644
--- a/app/routes/Semester.php
+++ b/app/routes/Semester.php
@@ -5,7 +5,7 @@ namespace RESTAPI\Routes;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition semester_id ^[0-9a-f]{1,32}$
  */
diff --git a/app/routes/Studip.php b/app/routes/Studip.php
index ae94d05aaafec4c2712ede7da836061c0b24fa8a..749a53adc495ccdd8370c68fdd0509ee441d60cb 100644
--- a/app/routes/Studip.php
+++ b/app/routes/Studip.php
@@ -9,7 +9,7 @@ use SemType;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Studip extends \RESTAPI\RouteMap
 {
diff --git a/app/routes/User.php b/app/routes/User.php
index 89649fce423bcef16d670e764e134fb30e06ef2e..16de204f5fa5a6273d617c161242b11539f430bb 100644
--- a/app/routes/User.php
+++ b/app/routes/User.php
@@ -5,7 +5,7 @@ namespace RESTAPI\Routes;
  * @author     André Klaßen <andre.klassen@elan-ev.de>
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition user_id ^[0-9a-f]{1,32}$
  */
diff --git a/app/routes/UserConfig.php b/app/routes/UserConfig.php
index 4ddd40b6d47b603a3ed7afc62083f5443b08fe40..ba015388f25300587a8636afcf55d987c882ff50 100644
--- a/app/routes/UserConfig.php
+++ b/app/routes/UserConfig.php
@@ -10,7 +10,7 @@ use RESTAPI\Router;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL2 or any later version
  * @since      Stud.IP 3.4
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition user_id ^[0-9a-f]{1,32}$
  *
diff --git a/app/routes/Wiki.php b/app/routes/Wiki.php
index 5a4a8168dbe137c887827bf296ec634970f8d1fa..d70a37b61550dfe1f0ecf23f498690e2a1d3e365 100644
--- a/app/routes/Wiki.php
+++ b/app/routes/Wiki.php
@@ -4,7 +4,7 @@ namespace RESTAPI\Routes;
 /**
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  *
  * @condition course_id ^[0-9a-f]{1,32}$
  */
diff --git a/lib/bootstrap-api.php b/lib/bootstrap-api.php
index 58756a8f570e53c47c93cbbfaf30e0b39938117a..ffa0b40d878889df02eabeea7770a68a8da23712 100644
--- a/lib/bootstrap-api.php
+++ b/lib/bootstrap-api.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
+ */
+
 namespace {
     StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'] . '/vendor/oauth-php/library');
 
diff --git a/lib/classes/restapi/ConsumerPermissions.php b/lib/classes/restapi/ConsumerPermissions.php
index a62ec11f7c1d7e64e58ad4ac4d85d7bbc31effc2..8fc225263bca09614a6a6946968c50b96c8c29e7 100644
--- a/lib/classes/restapi/ConsumerPermissions.php
+++ b/lib/classes/restapi/ConsumerPermissions.php
@@ -8,7 +8,7 @@ use DBManager, PDO;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class ConsumerPermissions
 {
diff --git a/lib/classes/restapi/Response.php b/lib/classes/restapi/Response.php
index 08a23d4792d32aab48eb8abfb15da57017552f1e..4417979baf8be6ae0567af071408f17cfce98d6e 100644
--- a/lib/classes/restapi/Response.php
+++ b/lib/classes/restapi/Response.php
@@ -7,7 +7,7 @@ namespace RESTAPI;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Response implements \ArrayAccess
 {
diff --git a/lib/classes/restapi/RouteMap.php b/lib/classes/restapi/RouteMap.php
index 0670f56e6eb183aab5df0ffbcab274639e46b678..717a41aca20a41b15230c98f7fca264bb3b0084c 100644
--- a/lib/classes/restapi/RouteMap.php
+++ b/lib/classes/restapi/RouteMap.php
@@ -158,7 +158,7 @@ use gossi\docblock\Docblock;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 abstract class RouteMap
 {
diff --git a/lib/classes/restapi/Router.php b/lib/classes/restapi/Router.php
index 232e9fe9d2eaea86040e4ef5cb5a4e09fbbb2d17..df7a6b92d4238aa5af52621744d9c24e0433158b 100644
--- a/lib/classes/restapi/Router.php
+++ b/lib/classes/restapi/Router.php
@@ -40,7 +40,7 @@ use RESTAPI\Renderer\DefaultRenderer;
  * @license    GPL 2 or later
  * @see        Inspired by http://blog.sosedoff.com/2009/07/04/simpe-php-url-routing-controller/
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Router
 {
diff --git a/lib/classes/restapi/RouterException.php b/lib/classes/restapi/RouterException.php
index 53fd3628040a89fa4f55f404a9fcb8cbee4bf10f..1ce2afc35e70bb0d1b85b5e69d6593bbae3db456 100644
--- a/lib/classes/restapi/RouterException.php
+++ b/lib/classes/restapi/RouterException.php
@@ -9,7 +9,7 @@ use \Exception;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class RouterException extends Exception
 {
diff --git a/lib/classes/restapi/RouterHalt.php b/lib/classes/restapi/RouterHalt.php
index 98c46b44a0439ecf55d64dd90e9a22a053bab97b..55a2ca1fbfddce659dba84cb175d045b6769ce58 100644
--- a/lib/classes/restapi/RouterHalt.php
+++ b/lib/classes/restapi/RouterHalt.php
@@ -5,7 +5,7 @@ namespace RESTAPI;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class RouterHalt extends \Exception
 {
diff --git a/lib/classes/restapi/UriTemplate.php b/lib/classes/restapi/UriTemplate.php
index bfdf23f398f91bee265fb25cac99bc22f5b8a214..67161deb9692584b000b780974282bd45e2a12c8 100644
--- a/lib/classes/restapi/UriTemplate.php
+++ b/lib/classes/restapi/UriTemplate.php
@@ -6,7 +6,7 @@ namespace RESTAPI;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class UriTemplate
 {
diff --git a/lib/classes/restapi/UserPermissions.php b/lib/classes/restapi/UserPermissions.php
index af5bc3673e513061c9d31b9ae298a598854ade9b..dcf16019f01d793ef5fced2999537a42835c4250 100644
--- a/lib/classes/restapi/UserPermissions.php
+++ b/lib/classes/restapi/UserPermissions.php
@@ -8,7 +8,7 @@ use DBManager, PDO;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL 2 or later
  * @since      Stud.IP 2.6
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class UserPermissions
 {
diff --git a/lib/classes/restapi/consumer/Base.php b/lib/classes/restapi/consumer/Base.php
index efb5b795af03c3e91edb93dab07287af61f5100e..62720917b9050e7ed4f6bfe188e95c6f68e3ef98 100644
--- a/lib/classes/restapi/consumer/Base.php
+++ b/lib/classes/restapi/consumer/Base.php
@@ -15,7 +15,7 @@ use PDO;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 abstract class Base extends \SimpleORMap
 {
diff --git a/lib/classes/restapi/consumer/HTTP.php b/lib/classes/restapi/consumer/HTTP.php
index b4a2239f3e3861b68fde6e63b17e1dab8d8c4e95..97b0657ac880edede29364b7841bdb5f9e155cab 100644
--- a/lib/classes/restapi/consumer/HTTP.php
+++ b/lib/classes/restapi/consumer/HTTP.php
@@ -8,7 +8,7 @@ use StudipAuthAbstract, RESTAPI\RouterException;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class HTTP extends Base
 {
diff --git a/lib/classes/restapi/consumer/OAuth.php b/lib/classes/restapi/consumer/OAuth.php
index f5d87ec302889e7a486b7dfe56ebdf10c78cd6be..caf51c2156e9d41fa82fae3822f862fe9045dba8 100644
--- a/lib/classes/restapi/consumer/OAuth.php
+++ b/lib/classes/restapi/consumer/OAuth.php
@@ -11,7 +11,7 @@ StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPAR
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class OAuth extends Base
 {
diff --git a/lib/classes/restapi/consumer/Studip.php b/lib/classes/restapi/consumer/Studip.php
index 46f8ad9996d26c588f785ec7162a43ce476f2380..738dd75735d94728d3c9a74a69afd0672d5b085c 100644
--- a/lib/classes/restapi/consumer/Studip.php
+++ b/lib/classes/restapi/consumer/Studip.php
@@ -7,7 +7,7 @@ namespace RESTAPI\Consumer;
  * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class Studip extends Base
 {
diff --git a/lib/classes/restapi/renderer/DebugRenderer.php b/lib/classes/restapi/renderer/DebugRenderer.php
index c9a94865bcd38329014af4679d5037895fefb9fd..afd56f62b29564155a97ed48a20f252b8d7374c1 100644
--- a/lib/classes/restapi/renderer/DebugRenderer.php
+++ b/lib/classes/restapi/renderer/DebugRenderer.php
@@ -8,7 +8,7 @@ namespace RESTAPI\Renderer;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class DebugRenderer extends DefaultRenderer
 {
diff --git a/lib/classes/restapi/renderer/DefaultRenderer.php b/lib/classes/restapi/renderer/DefaultRenderer.php
index b7e5ff589bf7c7d7f9bef22a7d0b1f39e21f1efb..836ba36b2cbd9bd897c33e1cb93fde2f8b8248db 100644
--- a/lib/classes/restapi/renderer/DefaultRenderer.php
+++ b/lib/classes/restapi/renderer/DefaultRenderer.php
@@ -13,7 +13,7 @@ namespace RESTAPI\Renderer;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class DefaultRenderer
 {
diff --git a/lib/classes/restapi/renderer/JSONRenderer.php b/lib/classes/restapi/renderer/JSONRenderer.php
index 040f2b7fd50fd41cd523cbcc8963d576c4d425c5..9c6e449e5e603dbeef29bf4fc02281cd56817c45 100644
--- a/lib/classes/restapi/renderer/JSONRenderer.php
+++ b/lib/classes/restapi/renderer/JSONRenderer.php
@@ -8,7 +8,7 @@ namespace RESTAPI\Renderer;
  * @author     <mlunzena@uos.de>
  * @license    GPL 2 or later
  * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */
 class JSONRenderer extends DefaultRenderer
 {
diff --git a/lib/plugins/core/RESTAPIPlugin.class.php b/lib/plugins/core/RESTAPIPlugin.class.php
index d395dea7fdcd0176c42b2d5eea36f43fdac13e4c..f69344c58ed471fef38bb0109055698266f7dba5 100644
--- a/lib/plugins/core/RESTAPIPlugin.class.php
+++ b/lib/plugins/core/RESTAPIPlugin.class.php
@@ -10,6 +10,9 @@
  * the License, or (at your option) any later version.
  */
 
+/**
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
+ */
 interface RESTAPIPlugin
 {
     /**
diff --git a/public/api.php b/public/api.php
index 762c140b58784b6a3aa7dc9f74534a5d1665d0d9..b2d30fa23510f09bdb35d0413802f1e4d30e85fa 100644
--- a/public/api.php
+++ b/public/api.php
@@ -14,7 +14,7 @@
  * zurück, dass dann anschließende ausgegeben wird, d.h. die Header
  * werden gesendet und dann das Ergebnis ausgegeben oder gestreamt.
  *
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 5.2.
+ * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
  */