diff --git a/appinfo/routes.php b/appinfo/routes.php
index c5831048..b00c4098 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -21,28 +21,26 @@ return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
 
-		//Get vaults
-		['name' => 'vault#index', 'url' => '/api/v1/vaults', 'verb' => 'GET'],
-
 		//Vault
+		['name' => 'vault#index', 'url' => '/api/v1/vaults', 'verb' => 'GET'],
 		['name' => 'vault#create', 'url' => '/api/v1/vaults', 'verb' => 'POST'],
 		['name' => 'vault#get', 'url' => '/api/v1/vaults/{vault_id}', 'verb' => 'GET'],
 		['name' => 'vault#update', 'url' => '/api/v1/vaults/{vault_id}', 'verb' => 'PATCH'],
 		['name' => 'vault#delete', 'url' => '/api/v1/vaults/{vault_id}', 'verb' => 'DELETE'],
 
 		//Credential
-		['name' => 'credential#create', 'url' => '/api/v1/credentials', 'verb' => 'POST'],
-		['name' => 'credential#get', 'url' => '/api/v1/credentials/{credential_id}', 'verb' => 'GET'],
-		['name' => 'credential#update', 'url' => '/api/v1/credentials/{credential_id}', 'verb' => 'PATCH'],
-		['name' => 'credential#delete', 'url' => '/api/v1/credentials/{credential_id}', 'verb' => 'DELETE'],
+		['name' => 'credential#createCredential', 'url' => '/api/v1/credentials', 'verb' => 'POST'],
+		['name' => 'credential#getCredential', 'url' => '/api/v1/credentials/{credential_id}', 'verb' => 'GET'],
+		['name' => 'credential#updateCredential', 'url' => '/api/v1/credentials/{credential_id}', 'verb' => 'PATCH'],
+		['name' => 'credential#deleteCredential', 'url' => '/api/v1/credentials/{credential_id}', 'verb' => 'DELETE'],
 
 		//Revisions
-		['name' => 'revision#get', 'url' => '/api/v1/credentials/{credential_id}/revision', 'verb' => 'GET'],
-		['name' => 'revision#delete', 'url' => '/api/v1/credentials/{credential_id}/revision/{revision_id}', 'verb' => 'DELETE'],
+		['name' => 'credential#getRevision', 'url' => '/api/v1/credentials/{credential_id}/revision', 'verb' => 'GET'],
+		['name' => 'credential#deleteRevision', 'url' => '/api/v1/credentials/{credential_id}/revision/{revision_id}', 'verb' => 'DELETE'],
 
 		//File stuff
-		['name' => 'file#upload', 'url' => '/api/v1/credentials/{credential_id}/file', 'verb' => 'POST'],
-		['name' => 'file#delete', 'url' => '/api/v1/credentials/{credential_id}/file/{file_id}', 'verb' => 'DELETE'],
+		['name' => 'credential#uploadFile', 'url' => '/api/v1/credentials/{credential_id}/file', 'verb' => 'POST'],
+		['name' => 'credential#deleteFile', 'url' => '/api/v1/credentials/{credential_id}/file/{file_id}', 'verb' => 'DELETE'],
 
 	]
 ];
\ No newline at end of file
diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php
index 09868935..865698f4 100644
--- a/controller/credentialcontroller.php
+++ b/controller/credentialcontroller.php
@@ -29,28 +29,56 @@ class CredentialController extends ApiController {
 	/**
 	 * @NoAdminRequired
 	 */
-	public function create() {
+	public function createCredential() {
 		return;
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function get($credential_id) {
+	public function getCredential($credential_id) {
 		return;
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function update($credential_id) {
+	public function updateCredential($credential_id) {
 		return;
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function delete($credential_id) {
+	public function deleteCredential($credential_id) {
+		return;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function getRevision($credential_id) {
+		return;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function deleteRevision($credential_id) {
+		return;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function uploadFile($credential_id) {
+		return;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function deleteFile($credential_id) {
 		return;
 	}
 }
\ No newline at end of file
diff --git a/controller/filecontroller.php b/controller/filecontroller.php
deleted file mode 100644
index 5e88ac79..00000000
--- a/controller/filecontroller.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Nextcloud - passman
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Sander Brand <brantje@gmail.com>
- * @copyright Sander Brand 2016
- */
-
-namespace OCA\Passman\Controller;
-
-use OCP\IRequest;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\ApiController;
-
-class FileController extends ApiController {
-
-
-	private $userId;
-
-	public function __construct($AppName, IRequest $request, $UserId){
-		parent::__construct($AppName, $request);
-		$this->userId = $UserId;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function upload($credential_id) {
-		return;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function delete($credential_id, $file_id) {
-		return;
-	}
-}
\ No newline at end of file
diff --git a/controller/revisioncontroller.php b/controller/revisioncontroller.php
deleted file mode 100644
index 46f81c9b..00000000
--- a/controller/revisioncontroller.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Nextcloud - passman
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Sander Brand <brantje@gmail.com>
- * @copyright Sander Brand 2016
- */
-
-namespace OCA\Passman\Controller;
-
-use OCP\IRequest;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\ApiController;
-
-class RevisionController extends ApiController {
-
-
-	private $userId;
-
-	public function __construct($AppName, IRequest $request, $UserId){
-		parent::__construct($AppName, $request);
-		$this->userId = $UserId;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function get($credential_id) {
-		return;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function delete($credential_id, $revision_id) {
-		return;
-	}
-}
\ No newline at end of file