diff --git a/apps/comments/activity/extension.php b/apps/comments/lib/Activity/Extension.php
similarity index 100%
rename from apps/comments/activity/extension.php
rename to apps/comments/lib/Activity/Extension.php
diff --git a/apps/comments/activity/listener.php b/apps/comments/lib/Activity/Listener.php
similarity index 100%
rename from apps/comments/activity/listener.php
rename to apps/comments/lib/Activity/Listener.php
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 5df740f699..b593b1134b 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -11,6 +11,7 @@
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>
+	<namespace>SystemTags</namespace>
 	<types>
 		<logging/>
 	</types>
diff --git a/apps/systemtags/activity/extension.php b/apps/systemtags/lib/Activity/Extension.php
similarity index 100%
rename from apps/systemtags/activity/extension.php
rename to apps/systemtags/lib/Activity/Extension.php
diff --git a/apps/systemtags/activity/listener.php b/apps/systemtags/lib/Activity/Listener.php
similarity index 100%
rename from apps/systemtags/activity/listener.php
rename to apps/systemtags/lib/Activity/Listener.php
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 9fbfa8e96b..5d7a647fd0 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -6,6 +6,7 @@
 	<licence>AGPL</licence>
 	<author>Lukas Reschke</author>
 	<version>0.2.0</version>
+	<namespace>UpdateNotification</namespace>
 	<default_enable/>
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
diff --git a/apps/updatenotification/appinfo/routes.php b/apps/updatenotification/appinfo/routes.php
index 9021d381b1..a8890afc59 100644
--- a/apps/updatenotification/appinfo/routes.php
+++ b/apps/updatenotification/appinfo/routes.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\UpdateNotification\AppInfo;
+use OCA\UpdateNotification\AppInfo\Application;
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
diff --git a/apps/updatenotification/appinfo/application.php b/apps/updatenotification/lib/AppInfo/Application.php
similarity index 100%
rename from apps/updatenotification/appinfo/application.php
rename to apps/updatenotification/lib/AppInfo/Application.php
diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/lib/Controller/AdminController.php
similarity index 100%
rename from apps/updatenotification/controller/admincontroller.php
rename to apps/updatenotification/lib/Controller/AdminController.php
diff --git a/apps/updatenotification/lib/resettokenbackgroundjob.php b/apps/updatenotification/lib/ResetTokenBackgroundJob.php
similarity index 100%
rename from apps/updatenotification/lib/resettokenbackgroundjob.php
rename to apps/updatenotification/lib/ResetTokenBackgroundJob.php
diff --git a/apps/updatenotification/lib/updatechecker.php b/apps/updatenotification/lib/UpdateChecker.php
similarity index 100%
rename from apps/updatenotification/lib/updatechecker.php
rename to apps/updatenotification/lib/UpdateChecker.php
diff --git a/apps/updatenotification/tests/controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php
similarity index 100%
rename from apps/updatenotification/tests/controller/AdminControllerTest.php
rename to apps/updatenotification/tests/Controller/AdminControllerTest.php