diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
new file mode 100644
index 0000000000..95770b44b7
--- /dev/null
+++ b/apps/files_external/appinfo/app.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php';
+OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php';
+OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
diff --git a/apps/files_remote/appinfo/info.xml b/apps/files_external/appinfo/info.xml
similarity index 58%
rename from apps/files_remote/appinfo/info.xml
rename to apps/files_external/appinfo/info.xml
index 8cf66ddbc3..fb58297ff1 100644
--- a/apps/files_remote/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <info>
-	<id>files_remote</id>
-	<name>Remote storage support</name>
-	<description>Mount remote storage sources</description>
+	<id>files_external</id>
+	<name>External storage support</name>
+	<description>Mount external storage sources</description>
 	<version>0.1</version>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
diff --git a/apps/files_remote/lib/ftp.php b/apps/files_external/lib/ftp.php
similarity index 100%
rename from apps/files_remote/lib/ftp.php
rename to apps/files_external/lib/ftp.php
diff --git a/apps/files_remote/lib/google.php b/apps/files_external/lib/google.php
similarity index 100%
rename from apps/files_remote/lib/google.php
rename to apps/files_external/lib/google.php
diff --git a/apps/files_remote/lib/webdav.php b/apps/files_external/lib/webdav.php
similarity index 100%
rename from apps/files_remote/lib/webdav.php
rename to apps/files_external/lib/webdav.php
diff --git a/apps/files_remote/tests/config.php b/apps/files_external/tests/config.php
similarity index 100%
rename from apps/files_remote/tests/config.php
rename to apps/files_external/tests/config.php
diff --git a/apps/files_remote/tests/ftp.php b/apps/files_external/tests/ftp.php
similarity index 89%
rename from apps/files_remote/tests/ftp.php
rename to apps/files_external/tests/ftp.php
index 03633b7c0d..aa565751ba 100644
--- a/apps/files_remote/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -12,7 +12,7 @@ class Test_Filestorage_FTP extends Test_FileStorage {
 
 	public function setUp(){
 		$id=uniqid();
-		$this->config=include('apps/files_remote/tests/config.php');
+		$this->config=include('apps/files_external/tests/config.php');
 		$this->config['ftp']['root'].='/'.$id;//make sure we have an new empty folder to work in
 		$this->instance=new OC_Filestorage_FTP($this->config['ftp']);
 	}
diff --git a/apps/files_remote/tests/google.php b/apps/files_external/tests/google.php
similarity index 94%
rename from apps/files_remote/tests/google.php
rename to apps/files_external/tests/google.php
index b49f9e4647..1c02894522 100644
--- a/apps/files_remote/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -27,7 +27,7 @@ class Test_Filestorage_Google extends Test_FileStorage {
 
 	public function setUp(){
 		$id=uniqid();
-		$this->config=include('apps/files_remote/tests/config.php');
+		$this->config=include('apps/files_external/tests/config.php');
 		$this->config['google']['root'].='/'.$id;//make sure we have an new empty folder to work in
 		$this->instance=new OC_Filestorage_Google($this->config['google']);
 	}
@@ -35,4 +35,4 @@ class Test_Filestorage_Google extends Test_FileStorage {
 	public function tearDown(){
 		$this->instance->rmdir('/');
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/files_remote/tests/webdav.php b/apps/files_external/tests/webdav.php
similarity index 89%
rename from apps/files_remote/tests/webdav.php
rename to apps/files_external/tests/webdav.php
index 219fff8852..5179929054 100644
--- a/apps/files_remote/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -12,7 +12,7 @@ class Test_Filestorage_DAV extends Test_FileStorage {
 
 	public function setUp(){
 		$id=uniqid();
-		$this->config=include('apps/files_remote/tests/config.php');
+		$this->config=include('apps/files_external/tests/config.php');
 		$this->config['webdav']['root'].='/'.$id;//make sure we have an new empty folder to work in
 		$this->instance=new OC_Filestorage_DAV($this->config['webdav']);
 	}
diff --git a/apps/files_remote/appinfo/app.php b/apps/files_remote/appinfo/app.php
deleted file mode 100644
index 02c1c3ae31..0000000000
--- a/apps/files_remote/appinfo/app.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_remote/lib/ftp.php';
-OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_remote/lib/webdav.php';
-OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_remote/lib/google.php';