diff --git a/admin.php b/admin.php
index 3c3ea7f..b085198 100644
--- a/admin.php
+++ b/admin.php
@@ -9,8 +9,8 @@
  * @copyright Pellaeon Lin 2015
  */
 
-namespace OCA\Registration\App;
+namespace OCA\Registration\AppInfo;
 
-$app = new Registration();
+$app = new Application();
 $controller = $app->getContainer()->query('SettingsController');
 return $controller->displayPanel()->render();
diff --git a/appinfo/app.php b/appinfo/app.php
index 3a54f5b..a29f1c5 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -9,9 +9,9 @@
  * @copyright Pellaeon Lin 2014
  */
 
-namespace OCA\Registration\App;
+namespace OCA\Registration\AppInfo;
 
-$app = new Registration();
+$app = new Application();
 $c = $app->getContainer();
 
 \OC_App::registerLogIn(array('name' => $c->query('L10N')->t('Register'), 'href' => $c->query('URLGenerator')->linkToRoute('registration.register.askEmail')));
diff --git a/app/registration.php b/appinfo/application.php
similarity index 97%
rename from app/registration.php
rename to appinfo/application.php
index 5f8f8c6..c0e1def 100644
--- a/app/registration.php
+++ b/appinfo/application.php
@@ -9,7 +9,7 @@
  * @copyright Pellaeon Lin 2014
  */
 
-namespace OCA\Registration\App;
+namespace OCA\Registration\AppInfo;
 
 use \OCP\AppFramework\App;
 
@@ -19,7 +19,7 @@ use \OCA\Registration\Wrapper;
 use \OCA\Registration\Db\PendingRegist;
 
 
-class Registration extends App {
+class Application extends App {
 
 	public function __construct (array $urlParams=array()) {
 		parent::__construct('registration', $urlParams);