Rename mount

Rename nacl_mounts to nacl_io since we plan to support more than
just file mounts.

TBR=binji@chromium.org
BUG=174171
NOTRY=true

Review URL: https://codereview.chromium.org/12194030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180793 0039d316-1c4b-4281-b951-d872f2087c98

87 files changed, 303 insertions, 303 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 79d7d527..996d539 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -603,7 +603,7 @@ EXAMPLE_LIST = [
   'file_io',
   'gamepad',
   'geturl',
-  'hello_nacl_mounts',
+  'hello_nacl_io',
   'hello_world_stdio',
   'hello_world',
   'hello_world_gles',
@@ -619,7 +619,7 @@ EXAMPLE_LIST = [
 
 LIBRARY_LIST = [
   'libjpeg',
-  'nacl_mounts',
+  'nacl_io',
   'ppapi',
   'ppapi_cpp',
   'ppapi_gles2',
diff --git a/native_client_sdk/src/build_tools/test_sdk.py b/native_client_sdk/src/build_tools/test_sdk.py
index a18a4ac..f245fb4 100755
--- a/native_client_sdk/src/build_tools/test_sdk.py
+++ b/native_client_sdk/src/build_tools/test_sdk.py
@@ -26,7 +26,7 @@ import getos
 
 
 TEST_EXAMPLE_LIST = [
-  'nacl_mounts_test',
+  'nacl_io_test',
 ]
 
 TEST_LIBRARY_LIST = [
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/Makefile b/native_client_sdk/src/examples/hello_nacl_io/Makefile
index c4d9da8..64dcbc6 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/Makefile
+++ b/native_client_sdk/src/examples/hello_nacl_io/Makefile
@@ -35,12 +35,12 @@ include $(NACL_SDK_ROOT)/tools/common.mk
 # The base name of the final NEXE, also the name of the NMF file containing
 # the mapping between architecture and actual NEXE.
 #
-TARGET=hello_nacl_mounts
+TARGET=hello_nacl_io
 
 #
 # List of sources to compile
 #
-SOURCES=handlers.c hello_nacl_mounts.c queue.c
+SOURCES=handlers.c hello_nacl_io.c queue.c
 
 
 #
@@ -56,7 +56,7 @@ SOURCES=handlers.c hello_nacl_mounts.c queue.c
 # and the set we do not.  This example does not havea any additional library
 # dependencies.
 #
-DEPS=nacl_mounts
+DEPS=nacl_io
 LIBS=$(DEPS) ppapi pthread
 
 
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/example.dsc b/native_client_sdk/src/examples/hello_nacl_io/example.dsc
index 0ac6dd6..1990108 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/example.dsc
+++ b/native_client_sdk/src/examples/hello_nacl_io/example.dsc
@@ -2,17 +2,17 @@
   'TOOLS': ['newlib', 'glibc', 'pnacl', 'win'],
   'TARGETS': [
     {
-      'NAME' : 'hello_nacl_mounts',
+      'NAME' : 'hello_nacl_io',
       'TYPE' : 'main',
       'SOURCES' : [
         'handlers.c',
         'handlers.h',
-        'hello_nacl_mounts.c',
-        'hello_nacl_mounts.h',
+        'hello_nacl_io.c',
+        'hello_nacl_io.h',
         'queue.c',
         'queue.h',
       ],
-      'LIBS': ['ppapi', 'pthread', 'nacl_mounts']
+      'LIBS': ['ppapi', 'pthread', 'nacl_io']
     }
   ],
   'DATA': [
@@ -20,13 +20,13 @@
     'example.js'
   ],
   'DEST': 'examples',
-  'NAME': 'hello_nacl_mounts',
-  'TITLE': 'Hello, Nacl Mounts!',
+  'NAME': 'hello_nacl_io',
+  'TITLE': 'Hello, Nacl IO!',
   'DESC': """
-The NaCl Mounts example demonstrates mapping standard FILE such as fopen,
-fread, fwrite into mounts by linking in the nacl_mounts library.  This allows
+The NaCl IO example demonstrates mapping standard FILE such as fopen,
+fread, fwrite into mounts by linking in the nacl_io library.  This allows
 developers to wrap Pepper API such as the File IO API or URL Loader into
 standard blocking calls.""",
-  'FOCUS': 'Using NaCl Mounts.',
+  'FOCUS': 'Using NaCl IO.',
   'GROUP': 'Concepts'
 }
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/example.js b/native_client_sdk/src/examples/hello_nacl_io/example.js
index c355b4d..c355b4d 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/example.js
+++ b/native_client_sdk/src/examples/hello_nacl_io/example.js
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/handlers.c b/native_client_sdk/src/examples/hello_nacl_io/handlers.c
index 1d95f52..062a41f 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/handlers.c
+++ b/native_client_sdk/src/examples/hello_nacl_io/handlers.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hello_nacl_mounts.h"
+#include "hello_nacl_io.h"
 
 #define MAX_OPEN_FILES 10
 
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/handlers.h b/native_client_sdk/src/examples/hello_nacl_io/handlers.h
index 9510dc7..9510dc7 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/handlers.h
+++ b/native_client_sdk/src/examples/hello_nacl_io/handlers.h
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/hello_nacl_mounts.c b/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.c
index 63543d7..fde9c1e 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/hello_nacl_mounts.c
+++ b/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "hello_nacl_mounts.h"
+#include "hello_nacl_io.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -20,7 +20,7 @@
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
-#include "nacl_mounts/nacl_mounts.h"
+#include "nacl_io/nacl_io.h"
 
 #include "handlers.h"
 #include "queue.h"
@@ -275,7 +275,7 @@ static PP_Bool Instance_DidCreate(PP_Instance instance,
                                   const char* argn[],
                                   const char* argv[]) {
   g_instance = instance;
-  nacl_mounts_init_ppapi(instance, get_browser_interface);
+  nacl_io_init_ppapi(instance, get_browser_interface);
   mount(
       "",  /* source */
       "/persistent",  /* target */
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/hello_nacl_mounts.h b/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.h
index bf33a93..82bf056 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/hello_nacl_mounts.h
+++ b/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef HELLO_NACL_MOUNTS_H_
-#define HELLO_NACL_MOUNTS_H_
+#ifndef HELLO_NACL_IO_H_
+#define HELLO_NACL_IO_H_
 
 #include <stdarg.h>
 #include "ppapi/c/pp_var.h"
@@ -15,4 +15,4 @@ char* PrintfToNewString(const char* format, ...);
 struct PP_Var PrintfToVar(const char* format, ...);
 uint32_t VarToCStr(struct PP_Var var, char* buffer, uint32_t length);
 
-#endif  /* HELLO_NACL_MOUNTS_H_ */
+#endif  /* HELLO_NACL_IO_H_ */
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/index.html b/native_client_sdk/src/examples/hello_nacl_io/index.html
index 2f9761c..f122758 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/index.html
+++ b/native_client_sdk/src/examples/hello_nacl_io/index.html
@@ -18,10 +18,10 @@ found in the LICENSE file.
   <h2>Status: <code id="statusField">NO-STATUS</code></h2>
   <p>
     This example shows how you can use standard C library file operation
-    functions in Native Client using a library called nacl_mounts.
+    functions in Native Client using a library called nacl_io.
   </p>
   <p>
-    nacl_mounts provides a virtual filesystem. The filesystem can be "mounted"
+    nacl_io provides a virtual filesystem. The filesystem can be "mounted"
     in a given directory tree. When you perform operations on files in those
     directories, the mount determines how those operations should be performed.
   </p>
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/queue.c b/native_client_sdk/src/examples/hello_nacl_io/queue.c
index bd0c438..bd0c438 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/queue.c
+++ b/native_client_sdk/src/examples/hello_nacl_io/queue.c
diff --git a/native_client_sdk/src/examples/hello_nacl_mounts/queue.h b/native_client_sdk/src/examples/hello_nacl_io/queue.h
index ed267f8..ed267f8 100644
--- a/native_client_sdk/src/examples/hello_nacl_mounts/queue.h
+++ b/native_client_sdk/src/examples/hello_nacl_io/queue.h
diff --git a/native_client_sdk/src/examples/hello_world_instance3d/Makefile b/native_client_sdk/src/examples/hello_world_instance3d/Makefile
index 41d3833..9decf00 100644
--- a/native_client_sdk/src/examples/hello_world_instance3d/Makefile
+++ b/native_client_sdk/src/examples/hello_world_instance3d/Makefile
@@ -56,7 +56,7 @@ SOURCES=hello_world.cc matrix.cc
 # and the set we do not. This  example does not have any additional library
 # dependencies.
 #
-DEPS=ppapi_main nacl_mounts ppapi_cpp ppapi_gles2
+DEPS=ppapi_main nacl_io ppapi_cpp ppapi_gles2
 LIBS=$(DEPS) ppapi pthread
 
 
diff --git a/native_client_sdk/src/examples/hello_world_instance3d/example.dsc b/native_client_sdk/src/examples/hello_world_instance3d/example.dsc
index 128f40c..62420e2 100644
--- a/native_client_sdk/src/examples/hello_world_instance3d/example.dsc
+++ b/native_client_sdk/src/examples/hello_world_instance3d/example.dsc
@@ -9,7 +9,7 @@
         '-I../../src',
         '-I../../src/ppapi/lib/gl'
       ],
-      'LIBS': ['ppapi_main', 'nacl_mounts', 'ppapi_gles2', 'ppapi_cpp', 'ppapi',
+      'LIBS': ['ppapi_main', 'nacl_io', 'ppapi_gles2', 'ppapi_cpp', 'ppapi',
                'pthread']
     }
   ],
diff --git a/native_client_sdk/src/examples/hello_world_instance3d/hello_world.cc b/native_client_sdk/src/examples/hello_world_instance3d/hello_world.cc
index 304c0fb..9a86d94 100644
--- a/native_client_sdk/src/examples/hello_world_instance3d/hello_world.cc
+++ b/native_client_sdk/src/examples/hello_world_instance3d/hello_world.cc
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "nacl_mounts/nacl_mounts.h"
+#include "nacl_io/nacl_io.h"
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/native_client_sdk/src/examples/hello_world_stdio/Makefile b/native_client_sdk/src/examples/hello_world_stdio/Makefile
index aa8f0f6..dfaa362 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/Makefile
+++ b/native_client_sdk/src/examples/hello_world_stdio/Makefile
@@ -54,7 +54,7 @@ SOURCES=hello_world.c
 # We break this list down into two parts, the set we need to rebuild (DEPS)
 # and the set we do not.
 #
-DEPS=ppapi_main nacl_mounts
+DEPS=ppapi_main nacl_io
 LIBS=$(DEPS) ppapi_cpp ppapi pthread
 
 
diff --git a/native_client_sdk/src/examples/hello_world_stdio/example.dsc b/native_client_sdk/src/examples/hello_world_stdio/example.dsc
index aefce01..167834f 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/example.dsc
+++ b/native_client_sdk/src/examples/hello_world_stdio/example.dsc
@@ -5,7 +5,7 @@
       'NAME' : 'hello_world_stdio',
       'TYPE' : 'main',
       'SOURCES' : ['hello_world.c'],
-      'LIBS': ['ppapi_main', 'nacl_mounts', 'ppapi_cpp', 'ppapi', 'pthread']
+      'LIBS': ['ppapi_main', 'nacl_io', 'ppapi_cpp', 'ppapi', 'pthread']
     }
   ],
   'DATA': [
@@ -20,7 +20,7 @@
   The Hello World Stdio example is the simplest one in the SDK.  It uses the
 ppapi_main library which creates an Module and Instance, using default values
 to simplify setup and communication with the PPAPI system.  In addition, it
-uses the nacl_mounts library to remap IO to the Pepper API.  This
+uses the nacl_io library to remap IO to the Pepper API.  This
 simplifies IO by providing a standard blocking API and allowing STDERR to go to
 the JavaScript console by default.""",
   'FOCUS': 'Basic HTML, JavaScript, Minimal App.',
diff --git a/native_client_sdk/src/examples/hello_world_stdio/index.html b/native_client_sdk/src/examples/hello_world_stdio/index.html
index 2beaf10..d7af88d 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/index.html
+++ b/native_client_sdk/src/examples/hello_world_stdio/index.html
@@ -18,9 +18,9 @@ found in the LICENSE file.
   <!-- The NaCl plugin will be embedded inside the element with id "listener".
       See common.js.-->
 
-  <p>This example demonstrates using nacl_mounts ppapi_main to simplify the
+  <p>This example demonstrates using nacl_io ppapi_main to simplify the
   creation of a PPAPI application.  The ppapi_main library handles the creation
-  and initialization of a pp::Instance object.  The nacl_mounts library
+  and initialization of a pp::Instance object.  The nacl_io library
   intercepts standard file IO, allowing the remapping of STDOUT, and
   STDERR.</p>
   <p>In main, we write to both STDOUT and STDERR, printing a hello world
diff --git a/native_client_sdk/src/libraries/nacl_mounts/Makefile b/native_client_sdk/src/libraries/nacl_io/Makefile
index 6c9714e..e8c9bc9 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/Makefile
+++ b/native_client_sdk/src/libraries/nacl_io/Makefile
@@ -35,7 +35,7 @@ include $(NACL_SDK_ROOT)/tools/common.mk
 # The base name of the final library, also the name of the NMF file containing
 # the mapping between architecture and actual NEXE.
 #
-TARGET=nacl_mounts
+TARGET=nacl_io
 
 #
 # List of sources to compile
@@ -44,7 +44,7 @@ SOURCES:=kernel_handle.cc kernel_intercept.cc kernel_object.cc kernel_proxy.cc
 SOURCES+=kernel_wrap_glibc.cc kernel_wrap_newlib.cc kernel_wrap_win.cc
 SOURCES+=mount.cc mount_dev.cc mount_html5fs.cc mount_http.cc mount_mem.cc
 SOURCES+=mount_node.cc mount_node_dir.cc mount_node_html5fs.cc mount_node_mem.cc
-SOURCES+=nacl_mounts.cc path.cc pepper_interface.cc real_pepper_interface.cc
+SOURCES+=nacl_io.cc path.cc pepper_interface.cc real_pepper_interface.cc
 
 #
 # Use the compile macro for each source.
diff --git a/native_client_sdk/src/libraries/nacl_mounts/inode_pool.h b/native_client_sdk/src/libraries/nacl_io/inode_pool.h
index aabd8606..5624b1d 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/inode_pool.h
+++ b/native_client_sdk/src/libraries/nacl_io/inode_pool.h
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#ifndef LIBRARIES_NACL_MOUNTS_INODE_POOL_H_
-#define LIBRARIES_NACL_MOUNTS_INODE_POOL_H_
+#ifndef LIBRARIES_NACL_IO_INODE_POOL_H_
+#define LIBRARIES_NACL_IO_INODE_POOL_H_
 
 #include <stdlib.h>
 #include <vector>
 
-#include "nacl_mounts/osstat.h"
+#include "nacl_io/osstat.h"
 #include "pthread.h"
 #include "utils/auto_lock.h"
 
@@ -62,4 +62,4 @@ class INodePool {
   pthread_mutex_t lock_;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_INODE_POOL_H_
+#endif  // LIBRARIES_NACL_IO_INODE_POOL_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.cc b/native_client_sdk/src/libraries/nacl_io/kernel_handle.cc
index f1f2600..3bcbc92 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_handle.cc
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/kernel_handle.h"
+#include "nacl_io/kernel_handle.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -13,8 +13,8 @@
 #include <unistd.h>
 #endif
 
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/mount_node.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/mount_node.h"
 
 // It is only legal to construct a handle while the kernel lock is held.
 KernelHandle::KernelHandle(Mount* mnt, MountNode* node, int mode)
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.h b/native_client_sdk/src/libraries/nacl_io/kernel_handle.h
index acbc1f1..a047125 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.h
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_handle.h
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_KERNEL_HANDLE_H_
-#define LIBRARIES_NACL_MOUNTS_KERNEL_HANDLE_H_
+#ifndef LIBRARIES_NACL_IO_KERNEL_HANDLE_H_
+#define LIBRARIES_NACL_IO_KERNEL_HANDLE_H_
 
 #include <pthread.h>
 
-#include "nacl_mounts/ostypes.h"
+#include "nacl_io/ostypes.h"
 #include "utils/macros.h"
 #include "utils/ref_object.h"
 
@@ -38,4 +38,4 @@ class KernelHandle : public RefObject {
   DISALLOW_COPY_AND_ASSIGN(KernelHandle);
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_KERNEL_HANDLE_H_
+#endif  // LIBRARIES_NACL_IO_KERNEL_HANDLE_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_intercept.cc b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc
index 049b21a..9af208d 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_intercept.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc
@@ -3,12 +3,12 @@
  * found in the LICENSE file.
  */
 #include <errno.h>
-#include "nacl_mounts/kernel_intercept.h"
-#include "nacl_mounts/kernel_proxy.h"
-#include "nacl_mounts/kernel_wrap.h"
-#include "nacl_mounts/pepper_interface.h"
-#include "nacl_mounts/pepper_interface.h"
-#include "nacl_mounts/real_pepper_interface.h"
+#include "nacl_io/kernel_intercept.h"
+#include "nacl_io/kernel_proxy.h"
+#include "nacl_io/kernel_wrap.h"
+#include "nacl_io/pepper_interface.h"
+#include "nacl_io/pepper_interface.h"
+#include "nacl_io/real_pepper_interface.h"
 
 
 static KernelProxy* s_kp;
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_intercept.h b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.h
index 4fc45ec..8cec8ae 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_intercept.h
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.h
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_KERNEL_INTERCEPT_H_
-#define LIBRARIES_NACL_MOUNTS_KERNEL_INTERCEPT_H_
+#ifndef LIBRARIES_NACL_IO_KERNEL_INTERCEPT_H_
+#define LIBRARIES_NACL_IO_KERNEL_INTERCEPT_H_
 
 #include <ppapi/c/ppb.h>
 #include <ppapi/c/pp_instance.h>
-#include "nacl_mounts/ostypes.h"
+#include "nacl_io/ostypes.h"
 #include "utils/macros.h"
 
 EXTERN_C_BEGIN
@@ -54,5 +54,5 @@ int ki_symlink(const char* oldpath, const char* newpath);
 
 EXTERN_C_END
 
-#endif  // LIBRARIES_NACL_MOUNTS_KERNEL_INTERCEPT_H_
+#endif  // LIBRARIES_NACL_IO_KERNEL_INTERCEPT_H_
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_object.cc b/native_client_sdk/src/libraries/nacl_io/kernel_object.cc
index 6ee6a33..f4ae9d5 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_object.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_object.cc
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/kernel_object.h"
+#include "nacl_io/kernel_object.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -14,9 +14,9 @@
 #include <string>
 #include <vector>
 
-#include "nacl_mounts/kernel_handle.h"
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/mount_node.h"
+#include "nacl_io/kernel_handle.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/mount_node.h"
 #include "utils/auto_lock.h"
 
 KernelObject::KernelObject() {
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_object.h b/native_client_sdk/src/libraries/nacl_io/kernel_object.h
index 9a5b6ab..fc02c3f 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_object.h
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_object.h
@@ -2,15 +2,15 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_KERNEL_OBJECT_H_
-#define LIBRARIES_NACL_MOUNTS_KERNEL_OBJECT_H_
+#ifndef LIBRARIES_NACL_IO_KERNEL_OBJECT_H_
+#define LIBRARIES_NACL_IO_KERNEL_OBJECT_H_
 
 #include <pthread.h>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "nacl_mounts/path.h"
+#include "nacl_io/path.h"
 
 class KernelHandle;
 class Mount;
@@ -59,4 +59,4 @@ class KernelObject {
   DISALLOW_COPY_AND_ASSIGN(KernelObject);
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_KERNEL_OBJECT_H_
+#endif  // LIBRARIES_NACL_IO_KERNEL_OBJECT_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_proxy.cc b/native_client_sdk/src/libraries/nacl_io/kernel_proxy.cc
index e1feedd..4e4e826 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_proxy.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_proxy.cc
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/kernel_proxy.h"
+#include "nacl_io/kernel_proxy.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -11,16 +11,16 @@
 #include <string.h>
 #include <string>
 
-#include "nacl_mounts/kernel_handle.h"
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/mount_dev.h"
-#include "nacl_mounts/mount_html5fs.h"
-#include "nacl_mounts/mount_http.h"
-#include "nacl_mounts/mount_mem.h"
-#include "nacl_mounts/mount_node.h"
-#include "nacl_mounts/osstat.h"
-#include "nacl_mounts/path.h"
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/kernel_handle.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/mount_dev.h"
+#include "nacl_io/mount_html5fs.h"
+#include "nacl_io/mount_http.h"
+#include "nacl_io/mount_mem.h"
+#include "nacl_io/mount_node.h"
+#include "nacl_io/osstat.h"
+#include "nacl_io/path.h"
+#include "nacl_io/pepper_interface.h"
 #include "utils/auto_lock.h"
 #include "utils/ref_object.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_proxy.h b/native_client_sdk/src/libraries/nacl_io/kernel_proxy.h
index 0df80ee..904ef52 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_proxy.h
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_proxy.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_KERNEL_PROXY_H_
-#define LIBRARIES_NACL_MOUNTS_KERNEL_PROXY_H_
+#ifndef LIBRARIES_NACL_IO_KERNEL_PROXY_H_
+#define LIBRARIES_NACL_IO_KERNEL_PROXY_H_
 
 #include <ppapi/c/pp_instance.h>
 #include <ppapi/c/ppb.h>
@@ -12,10 +12,10 @@
 #include <string>
 #include <vector>
 
-#include "nacl_mounts/kernel_object.h"
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/ostypes.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/kernel_object.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/ostypes.h"
+#include "nacl_io/path.h"
 
 class KernelHandle;
 class Mount;
@@ -46,7 +46,7 @@ class KernelProxy : protected KernelObject {
   virtual int chdir(const char* path);
   virtual char* getcwd(char* buf, size_t size);
   virtual char* getwd(char* buf);
-  virtual int mount(const char *source, const char *target, 
+  virtual int mount(const char *source, const char *target,
       const char *filesystemtype, unsigned long mountflags, const void *data);
   virtual int umount(const char *path);
 
@@ -99,4 +99,4 @@ protected:
   DISALLOW_COPY_AND_ASSIGN(KernelProxy);
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_KERNEL_PROXY_H_
+#endif  // LIBRARIES_NACL_IO_KERNEL_PROXY_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap.h b/native_client_sdk/src/libraries/nacl_io/kernel_wrap.h
index d7ba17fa..7d88cfd 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap.h
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_KERNEL_WRAP_H_
-#define LIBRARIES_NACL_MOUNTS_KERNEL_WRAP_H_
+#ifndef LIBRARIES_NACL_IO_KERNEL_WRAP_H_
+#define LIBRARIES_NACL_IO_KERNEL_WRAP_H_
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -82,4 +82,4 @@ read_ssize_t NAME(write)(int fd, const void* buf, size_t nbyte);
 
 EXTERN_C_END
 
-#endif  // LIBRARIES_NACL_MOUNTS_KERNEL_WRAP_H_
+#endif  // LIBRARIES_NACL_IO_KERNEL_WRAP_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap_glibc.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc
index 3726b9e..8051f92 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap_glibc.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc
@@ -9,7 +9,7 @@
 // compiled, even on a non-glibc build.
 #if defined(__native_client__) && defined(__GLIBC__)
 
-#include "nacl_mounts/kernel_wrap.h"
+#include "nacl_io/kernel_wrap.h"
 #include <alloca.h>
 #include <dirent.h>
 #include <errno.h>
@@ -18,7 +18,7 @@
 #include <nacl_stat.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "nacl_mounts/kernel_intercept.h"
+#include "nacl_io/kernel_intercept.h"
 
 
 namespace {
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap_newlib.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc
index ff6b6bb..59d1435 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap_newlib.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc
@@ -9,12 +9,12 @@
 // compiled, even on a non-newlib build.
 #if defined(__native_client__) && !defined(__GLIBC__)
 
-#include "nacl_mounts/kernel_wrap.h"
+#include "nacl_io/kernel_wrap.h"
 #include <dirent.h>
 #include <errno.h>
 #include <irt.h>
 #include <sys/stat.h>
-#include "nacl_mounts/kernel_intercept.h"
+#include "nacl_io/kernel_intercept.h"
 
 EXTERN_C_BEGIN
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap_win.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
index f3355ed..b446a15 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/kernel_wrap_win.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
@@ -7,14 +7,14 @@
 // compiled, even on a non-Windows build.
 #if defined(WIN32)
 
-#include "nacl_mounts/kernel_wrap.h"
+#include "nacl_io/kernel_wrap.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <string.h>
 #include <sys/types.h>  // This must be included before <sys/stat.h>.
 #include <sys/stat.h>
-#include "nacl_mounts/kernel_intercept.h"
+#include "nacl_io/kernel_intercept.h"
 
 namespace {
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc
index bf4e53f..6c7015b 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/library.dsc
+++ b/native_client_sdk/src/libraries/nacl_io/library.dsc
@@ -9,7 +9,7 @@
   ],
   'TARGETS': [
     {
-      'NAME' : 'nacl_mounts',
+      'NAME' : 'nacl_io',
       'TYPE' : 'lib',
       'SOURCES' : [
         "kernel_handle.cc",
@@ -28,7 +28,7 @@
         "mount_node_dir.cc",
         "mount_node_html5fs.cc",
         "mount_node_mem.cc",
-        "nacl_mounts.cc",
+        "nacl_io.cc",
         "path.cc",
         "pepper_interface.cc",
         "real_pepper_interface.cc",
@@ -53,7 +53,7 @@
         "mount_node.h",
         "mount_node_html5fs.h",
         "mount_node_mem.h",
-        "nacl_mounts.h",
+        "nacl_io.h",
         "osdirent.h",
         "osinttypes.h",
         "osstat.h",
@@ -62,7 +62,7 @@
         "pepper_interface.h",
         "real_pepper_interface.h",
       ],
-      'DEST': 'include/nacl_mounts',
+      'DEST': 'include/nacl_io',
     },
     {
       'FILES': [
@@ -70,7 +70,7 @@
         "define_empty_macros.h",
         "undef_macros.h",
       ],
-      'DEST': 'include/nacl_mounts/pepper',
+      'DEST': 'include/nacl_io/pepper',
     },
     {
       'FILES': [
@@ -85,5 +85,5 @@
     'Makefile',
   ],
   'DEST': 'src',
-  'NAME': 'nacl_mounts',
+  'NAME': 'nacl_io',
 }
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount.cc b/native_client_sdk/src/libraries/nacl_io/mount.cc
index 07be9b396..8b583db 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount.cc
@@ -2,17 +2,17 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/mount.h"
+#include "nacl_io/mount.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string>
 
-#include "nacl_mounts/mount_node.h"
-#include "nacl_mounts/mount_node_dir.h"
-#include "nacl_mounts/mount_node_mem.h"
-#include "nacl_mounts/osstat.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/mount_node.h"
+#include "nacl_io/mount_node_dir.h"
+#include "nacl_io/mount_node_mem.h"
+#include "nacl_io/osstat.h"
+#include "nacl_io/path.h"
 #include "utils/auto_lock.h"
 #include "utils/ref_object.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount.h b/native_client_sdk/src/libraries/nacl_io/mount.h
index e1da725..dfc2e72 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount.h
@@ -2,15 +2,15 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_H_
+#define LIBRARIES_NACL_IO_MOUNT_H_
 
 #include <map>
 #include <string>
 
-#include "nacl_mounts/inode_pool.h"
-#include "nacl_mounts/mount_node.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/inode_pool.h"
+#include "nacl_io/mount_node.h"
+#include "nacl_io/path.h"
 #include "utils/macros.h"
 #include "utils/ref_object.h"
 
@@ -89,4 +89,4 @@ Mount* Mount::Create(int dev, StringMap_t& args, PepperInterface* ppapi) {
   return mnt;
 }
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_dev.cc b/native_client_sdk/src/libraries/nacl_io/mount_dev.cc
index a85f8de..6988331 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_dev.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_dev.cc
@@ -9,10 +9,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
-#include "nacl_mounts/mount_dev.h"
-#include "nacl_mounts/mount_node.h"
-#include "nacl_mounts/mount_node_dir.h"
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/mount_dev.h"
+#include "nacl_io/mount_node.h"
+#include "nacl_io/mount_node_dir.h"
+#include "nacl_io/pepper_interface.h"
 #include "utils/auto_lock.h"
 
 #if defined(__native_client__)
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_dev.h b/native_client_sdk/src/libraries/nacl_io/mount_dev.h
index 4d81186..b47df43 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_dev.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_dev.h
@@ -2,10 +2,10 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_DEV_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_DEV_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_DEV_H_
+#define LIBRARIES_NACL_IO_MOUNT_DEV_H_
 
-#include "nacl_mounts/mount.h"
+#include "nacl_io/mount.h"
 
 class MountNode;
 
@@ -38,4 +38,4 @@ class MountDev : public Mount {
   friend class Mount;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_DEV_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_DEV_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_html5fs.cc b/native_client_sdk/src/libraries/nacl_io/mount_html5fs.cc
index 1eff4bc..abe62e6 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_html5fs.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_html5fs.cc
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "nacl_mounts/mount_html5fs.h"
+#include "nacl_io/mount_html5fs.h"
 
 #include <errno.h>
 #include <ppapi/c/pp_completion_callback.h>
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <algorithm>
-#include "nacl_mounts/mount_node_html5fs.h"
+#include "nacl_io/mount_node_html5fs.h"
 #include "utils/auto_lock.h"
 
 namespace {
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_html5fs.h b/native_client_sdk/src/libraries/nacl_io/mount_html5fs.h
index 4c54f171..1e532b5 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_html5fs.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_html5fs.h
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_HTML5FS_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_HTML5FS_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_HTML5FS_H_
+#define LIBRARIES_NACL_IO_MOUNT_HTML5FS_H_
 
 #include <pthread.h>
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/pepper_interface.h"
 
 class MountNode;
 
@@ -39,4 +39,4 @@ class MountHtml5Fs: public Mount {
   friend class Mount;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_HTML5FS_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_HTML5FS_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_http.cc b/native_client_sdk/src/libraries/nacl_io/mount_http.cc
index 0bcdd27..e387dba 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_http.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_http.cc
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "nacl_mounts/mount_http.h"
+#include "nacl_io/mount_http.h"
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -14,8 +14,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <vector>
-#include "nacl_mounts/mount_node_dir.h"
-#include "nacl_mounts/osinttypes.h"
+#include "nacl_io/mount_node_dir.h"
+#include "nacl_io/osinttypes.h"
 #include "utils/auto_lock.h"
 
 #if defined(WIN32)
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_http.h b/native_client_sdk/src/libraries/nacl_io/mount_http.h
index 7b0b1dd..eacfb2c 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_http.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_http.h
@@ -3,12 +3,12 @@
  * found in the LICENSE file.
  */
 
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_HTTP_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_HTTP_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_HTTP_H_
+#define LIBRARIES_NACL_IO_MOUNT_HTTP_H_
 
 #include <string>
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/pepper_interface.h"
 
 class MountNode;
 class MountNodeDir;
@@ -51,4 +51,4 @@ class MountHttp : public Mount {
   friend class MountHttpMock;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_HTTP_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_HTTP_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_mem.cc b/native_client_sdk/src/libraries/nacl_io/mount_mem.cc
index 8a61dc0..e14ed3d 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_mem.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_mem.cc
@@ -2,18 +2,18 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/mount_mem.h"
+#include "nacl_io/mount_mem.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string>
 
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/mount_node.h"
-#include "nacl_mounts/mount_node_dir.h"
-#include "nacl_mounts/mount_node_mem.h"
-#include "nacl_mounts/osstat.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/mount_node.h"
+#include "nacl_io/mount_node_dir.h"
+#include "nacl_io/mount_node_mem.h"
+#include "nacl_io/osstat.h"
+#include "nacl_io/path.h"
 #include "utils/auto_lock.h"
 #include "utils/ref_object.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_mem.h b/native_client_sdk/src/libraries/nacl_io/mount_mem.h
index 375e94e..dc75e81 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_mem.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_mem.h
@@ -2,13 +2,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_MEM_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_MEM_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_MEM_H_
+#define LIBRARIES_NACL_IO_MOUNT_MEM_H_
 
 #include <map>
 #include <string>
 
-#include "nacl_mounts/mount.h"
+#include "nacl_io/mount.h"
 
 class MountMem : public Mount {
  protected:
@@ -51,4 +51,4 @@ private:
   DISALLOW_COPY_AND_ASSIGN(MountMem);
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_MEM_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_MEM_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node.cc b/native_client_sdk/src/libraries/nacl_io/mount_node.cc
index f965b21..47c142c 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node.cc
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/mount_node.h"
+#include "nacl_io/mount_node.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <string>
 
-#include "nacl_mounts/mount.h"
+#include "nacl_io/mount.h"
 #include "utils/auto_lock.h"
 
 static const int USR_ID = 1001;
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node.h b/native_client_sdk/src/libraries/nacl_io/mount_node.h
index c52e765..aedc093 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node.h
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_NODE_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_NODE_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_NODE_H_
+#define LIBRARIES_NACL_IO_MOUNT_NODE_H_
 
 #include <string>
 
-#include "nacl_mounts/osstat.h"
+#include "nacl_io/osstat.h"
 #include "utils/ref_object.h"
 
 struct dirent;
@@ -72,4 +72,4 @@ protected:
   friend class MountNodeDir;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_NODE_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_NODE_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node_dir.cc b/native_client_sdk/src/libraries/nacl_io/mount_node_dir.cc
index 230592c..b97491f 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node_dir.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node_dir.cc
@@ -2,13 +2,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/mount_node_dir.h"
+#include "nacl_io/mount_node_dir.h"
 
 #include <errno.h>
 #include <string.h>
 
-#include "nacl_mounts/osdirent.h"
-#include "nacl_mounts/osstat.h"
+#include "nacl_io/osdirent.h"
+#include "nacl_io/osstat.h"
 #include "utils/macros.h"
 #include "utils/auto_lock.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node_dir.h b/native_client_sdk/src/libraries/nacl_io/mount_node_dir.h
index 4a32831..b747207 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node_dir.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node_dir.h
@@ -2,13 +2,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_NODE_DIR_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_NODE_DIR_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_NODE_DIR_H_
+#define LIBRARIES_NACL_IO_MOUNT_NODE_DIR_H_
 
 #include <map>
 #include <string>
 
-#include "nacl_mounts/mount_node.h"
+#include "nacl_io/mount_node.h"
 
 struct dirent;
 
@@ -51,4 +51,4 @@ private:
   friend class MountHtml5Fs;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_NODE_DIR_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_NODE_DIR_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node_html5fs.cc b/native_client_sdk/src/libraries/nacl_io/mount_node_html5fs.cc
index ba0ca73..6cbcc48 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node_html5fs.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node_html5fs.cc
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "nacl_mounts/mount_node_html5fs.h"
+#include "nacl_io/mount_node_html5fs.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -13,9 +13,9 @@
 #include <ppapi/c/ppb_file_io.h>
 #include <string.h>
 #include <vector>
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/osdirent.h"
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/osdirent.h"
+#include "nacl_io/pepper_interface.h"
 #include "utils/auto_lock.h"
 
 namespace {
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node_html5fs.h b/native_client_sdk/src/libraries/nacl_io/mount_node_html5fs.h
index 62a6d31..535ae3a 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node_html5fs.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node_html5fs.h
@@ -2,11 +2,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_HTML5FS_NODE_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_HTML5FS_NODE_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_HTML5FS_NODE_H_
+#define LIBRARIES_NACL_IO_MOUNT_HTML5FS_NODE_H_
 
 #include <ppapi/c/pp_resource.h>
-#include "nacl_mounts/mount_node.h"
+#include "nacl_io/mount_node.h"
 
 class MountHtml5Fs;
 
@@ -38,4 +38,4 @@ class MountNodeHtml5Fs : public MountNode {
   friend class MountHtml5Fs;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_HTML5FS_NODE_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_HTML5FS_NODE_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node_mem.cc b/native_client_sdk/src/libraries/nacl_io/mount_node_mem.cc
index 7cb01b5..248fed4 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node_mem.cc
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node_mem.cc
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/mount_node_mem.h"
+#include "nacl_io/mount_node_mem.h"
 
 #include <errno.h>
 #include <string.h>
 
-#include "nacl_mounts/osstat.h"
+#include "nacl_io/osstat.h"
 #include "utils/auto_lock.h"
 
 #define BLOCK_SIZE (1 << 16)
diff --git a/native_client_sdk/src/libraries/nacl_mounts/mount_node_mem.h b/native_client_sdk/src/libraries/nacl_io/mount_node_mem.h
index ded4cc3..f7e4fff 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/mount_node_mem.h
+++ b/native_client_sdk/src/libraries/nacl_io/mount_node_mem.h
@@ -2,10 +2,10 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_MOUNT_NODE_MEM_H_
-#define LIBRARIES_NACL_MOUNTS_MOUNT_NODE_MEM_H_
+#ifndef LIBRARIES_NACL_IO_MOUNT_NODE_MEM_H_
+#define LIBRARIES_NACL_IO_MOUNT_NODE_MEM_H_
 
-#include "nacl_mounts/mount_node.h"
+#include "nacl_io/mount_node.h"
 
 class MountNodeMem : public MountNode {
  public:
@@ -26,4 +26,4 @@ class MountNodeMem : public MountNode {
   friend class MountMem;
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_MOUNT_NODE_MEM_H_
+#endif  // LIBRARIES_NACL_IO_MOUNT_NODE_MEM_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.cc b/native_client_sdk/src/libraries/nacl_io/nacl_io.cc
index 8490c30..9750cd8 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.cc
+++ b/native_client_sdk/src/libraries/nacl_io/nacl_io.cc
@@ -3,16 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include "nacl_mounts/nacl_mounts.h"
+#include "nacl_io/nacl_io.h"
 
 #include <stdlib.h>
-#include "nacl_mounts/kernel_intercept.h"
+#include "nacl_io/kernel_intercept.h"
 
-void nacl_mounts_init() {
+void nacl_io_init() {
   ki_init(NULL);
 }
 
-void nacl_mounts_init_ppapi(PP_Instance instance,
-                            PPB_GetInterface get_interface) {
+void nacl_io_init_ppapi(PP_Instance instance,
+                        PPB_GetInterface get_interface) {
   ki_init_ppapi(NULL, instance, get_interface);
 }
diff --git a/native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.h b/native_client_sdk/src/libraries/nacl_io/nacl_io.h
index d750f56f..3a94057 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.h
+++ b/native_client_sdk/src/libraries/nacl_io/nacl_io.h
@@ -2,31 +2,31 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_NACL_MOUNTS_H_
-#define LIBRARIES_NACL_MOUNTS_NACL_MOUNTS_H_
+#ifndef LIBRARIES_NACL_IO_NACL_IO_H_
+#define LIBRARIES_NACL_IO_NACL_IO_H_
 
 #include <ppapi/c/pp_instance.h>
 #include <ppapi/c/ppb.h>
 
-#include "nacl_mounts/kernel_wrap.h"
+#include "nacl_io/kernel_wrap.h"
 #include "utils/macros.h"
 
 EXTERN_C_BEGIN
 
 
-/** Initialize nacl_mounts.
+/** Initialize nacl_io.
  *
- * NOTE: If you initialize nacl_mounts with this constructor, you cannot
+ * NOTE: If you initialize nacl_io with this constructor, you cannot
  * use any mounts that require PPAPI; e.g. persistent storage, etc.
  */
-void nacl_mounts_init();
+void nacl_io_init();
 
-/** Initialize nacl_mounts with PPAPI support.
+/** Initialize nacl_io with PPAPI support.
  *
  * Usage:
  *   PP_Instance instance;
  *   PPB_GetInterface get_interface;
- *   nacl_mounts_init(instance, get_interface);
+ *   nacl_io_init(instance, get_interface);
  *
  * If you are using the PPAPI C interface:
  *   |instance| is passed to your instance in the DidCreate function.
@@ -38,7 +38,7 @@ void nacl_mounts_init();
  *   |get_interface| can be retrieved via
  *       pp::Module::Get()->get_browser_interface()
  */
-void nacl_mounts_init_ppapi(PP_Instance instance,
+void nacl_io_init_ppapi(PP_Instance instance,
                             PPB_GetInterface get_interface);
 
 
@@ -108,4 +108,4 @@ int mount(const char* source, const char* target, const char* filesystemtype,
 
 EXTERN_C_END
 
-#endif  // LIBRARIES_NACL_MOUNTS_NACL_MOUNTS_H_
+#endif  // LIBRARIES_NACL_IO_NACL_IO_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.vcproj b/native_client_sdk/src/libraries/nacl_io/nacl_mounts.vcproj
index 875a16f..875a16f 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.vcproj
+++ b/native_client_sdk/src/libraries/nacl_io/nacl_mounts.vcproj
diff --git a/native_client_sdk/src/libraries/nacl_mounts/osdirent.h b/native_client_sdk/src/libraries/nacl_io/osdirent.h
index bea9500..22dcd61 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/osdirent.h
+++ b/native_client_sdk/src/libraries/nacl_io/osdirent.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_OSDIRENT_H_
-#define LIBRARIES_NACL_MOUNTS_OSDIRENT_H_
+#ifndef LIBRARIES_NACL_IO_OSDIRENT_H_
+#define LIBRARIES_NACL_IO_OSDIRENT_H_
 
 #if defined(WIN32)
 
@@ -23,4 +23,4 @@ struct dirent {
 
 #endif
 
-#endif  // LIBRARIES_NACL_MOUNTS_OSDIRENT_H_
+#endif  // LIBRARIES_NACL_IO_OSDIRENT_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/osinttypes.h b/native_client_sdk/src/libraries/nacl_io/osinttypes.h
index e6705f0..346d394 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/osinttypes.h
+++ b/native_client_sdk/src/libraries/nacl_io/osinttypes.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef NACL_MOUNTS_OSINTTYPES_H_
-#define NACL_MOUNTS_OSINTTYPES_H_
+#ifndef NACL_IO_OSINTTYPES_H_
+#define NACL_IO_OSINTTYPES_H_
 
 // Define printf/scanf format strings for size_t.
 
@@ -31,4 +31,4 @@
 
 #endif  // defined(__native_client__)
 
-#endif  // NACL_MOUNTS_OSINTTYPES_H_
+#endif  // NACL_IO_OSINTTYPES_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/osstat.h b/native_client_sdk/src/libraries/nacl_io/osstat.h
index b02c2af..a708b17 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/osstat.h
+++ b/native_client_sdk/src/libraries/nacl_io/osstat.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_OSSTAT_H_
-#define LIBRARIES_NACL_MOUNTS_OSSTAT_H_
+#ifndef LIBRARIES_NACL_IO_OSSTAT_H_
+#define LIBRARIES_NACL_IO_OSSTAT_H_
 
 #include <sys/stat.h>
 
@@ -19,4 +19,4 @@
 #define S_IEXEC _S_IEXEC
 #endif
 
-#endif  // LIBRARIES_NACL_MOUNTS_OSSTAT_H_
+#endif  // LIBRARIES_NACL_IO_OSSTAT_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/ostypes.h b/native_client_sdk/src/libraries/nacl_io/ostypes.h
index 39fa145..5adc6fe 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/ostypes.h
+++ b/native_client_sdk/src/libraries/nacl_io/ostypes.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_OSTYPES_H_
-#define LIBRARIES_NACL_MOUNTS_OSTYPES_H_
+#ifndef LIBRARIES_NACL_IO_OSTYPES_H_
+#define LIBRARIES_NACL_IO_OSTYPES_H_
 
 #include <sys/types.h>
 
@@ -16,4 +16,4 @@ typedef SSIZE_T ssize_t;
 
 #endif
 
-#endif  // LIBRARIES_NACL_MOUNTS_OSTYPES_H_
+#endif  // LIBRARIES_NACL_IO_OSTYPES_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/path.cc b/native_client_sdk/src/libraries/nacl_io/path.cc
index 57f3666..463e9d4 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/path.cc
+++ b/native_client_sdk/src/libraries/nacl_io/path.cc
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/path.h"
+#include "nacl_io/path.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/native_client_sdk/src/libraries/nacl_mounts/path.h b/native_client_sdk/src/libraries/nacl_io/path.h
index 243fa16..d1a381b 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/path.h
+++ b/native_client_sdk/src/libraries/nacl_io/path.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_PATH_H_
-#define LIBRARIES_NACL_MOUNTS_PATH_H_
+#ifndef LIBRARIES_NACL_IO_PATH_H_
+#define LIBRARIES_NACL_IO_PATH_H_
 
 #include <string>
 #include <vector>
@@ -66,4 +66,4 @@ class Path {
   StringArray_t paths_;
 };
 
-#endif  // PACKAGES_LIBRARIES_NACL_MOUNTS_PATH_H_
+#endif  // PACKAGES_LIBRARIES_NACL_IO_PATH_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/pepper/all_interfaces.h b/native_client_sdk/src/libraries/nacl_io/pepper/all_interfaces.h
index 0851dc4..0851dc4 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/pepper/all_interfaces.h
+++ b/native_client_sdk/src/libraries/nacl_io/pepper/all_interfaces.h
diff --git a/native_client_sdk/src/libraries/nacl_mounts/pepper/define_empty_macros.h b/native_client_sdk/src/libraries/nacl_io/pepper/define_empty_macros.h
index c93b6d8..c93b6d8 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/pepper/define_empty_macros.h
+++ b/native_client_sdk/src/libraries/nacl_io/pepper/define_empty_macros.h
diff --git a/native_client_sdk/src/libraries/nacl_mounts/pepper/undef_macros.h b/native_client_sdk/src/libraries/nacl_io/pepper/undef_macros.h
index 1b75b46..1b75b46 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/pepper/undef_macros.h
+++ b/native_client_sdk/src/libraries/nacl_io/pepper/undef_macros.h
diff --git a/native_client_sdk/src/libraries/nacl_mounts/pepper_interface.cc b/native_client_sdk/src/libraries/nacl_io/pepper_interface.cc
index 51dff4e..21c3462 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/pepper_interface.cc
+++ b/native_client_sdk/src/libraries/nacl_io/pepper_interface.cc
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/pepper_interface.h"
 #include <errno.h>
 #include <ppapi/c/pp_errors.h>
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts/pepper_interface.h b/native_client_sdk/src/libraries/nacl_io/pepper_interface.h
index 2c5c004..edeb036 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/pepper_interface.h
+++ b/native_client_sdk/src/libraries/nacl_io/pepper_interface.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_PEPPER_INTERFACE_H_
-#define LIBRARIES_NACL_MOUNTS_PEPPER_INTERFACE_H_
+#ifndef LIBRARIES_NACL_IO_PEPPER_INTERFACE_H_
+#define LIBRARIES_NACL_IO_PEPPER_INTERFACE_H_
 
 #include <ppapi/c/dev/ppb_directory_reader_dev.h>
 #include <ppapi/c/pp_completion_callback.h>
@@ -33,12 +33,12 @@
 
 
 // Forward declare interface classes.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     class BaseClass;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
 int PPErrorToErrno(int32_t err);
 
@@ -50,12 +50,12 @@ class PepperInterface {
   virtual void ReleaseResource(PP_Resource) = 0;
 
 // Interface getters.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     virtual BaseClass* Get##BaseClass() = 0;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 };
 
 // Interface class definitions.
@@ -76,8 +76,8 @@ class PepperInterface {
 #define METHOD5(Class, ReturnType, MethodName, Type0, Type1, Type2, Type3, \
                 Type4) \
     virtual ReturnType MethodName(Type0, Type1, Type2, Type3, Type4) = 0;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
 
 class ScopedResource {
@@ -98,4 +98,4 @@ class ScopedResource {
   DISALLOW_COPY_AND_ASSIGN(ScopedResource);
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_PEPPER_INTERFACE_H_
+#endif  // LIBRARIES_NACL_IO_PEPPER_INTERFACE_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts/real_pepper_interface.cc b/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.cc
index 22d9ea8..cbe7558 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/real_pepper_interface.cc
+++ b/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.cc
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include "nacl_mounts/real_pepper_interface.h"
+#include "nacl_io/real_pepper_interface.h"
 #include <assert.h>
 #include <stdio.h>
 
 #include <ppapi/c/pp_errors.h>
 
 
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/undef_macros.h"
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     class Real##BaseClass : public BaseClass { \
      public: \
@@ -30,10 +30,10 @@
 #define METHOD5(Class, ReturnType, MethodName, Type0, Type1, Type2, Type3, \
                 Type4) \
     virtual ReturnType MethodName(Type0, Type1, Type2, Type3, Type4);
-#include "nacl_mounts/pepper/all_interfaces.h"
+#include "nacl_io/pepper/all_interfaces.h"
 
 
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/undef_macros.h"
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     Real##BaseClass::Real##BaseClass(const PPInterface* interface) \
         : interface_(interface) {}
@@ -64,7 +64,7 @@
                                            Type3 arg3, Type4 arg4) { \
       return interface_->MethodName(arg0, arg1, arg2, arg3, arg4); \
     }
-#include "nacl_mounts/pepper/all_interfaces.h"
+#include "nacl_io/pepper/all_interfaces.h"
 
 
 RealPepperInterface::RealPepperInterface(PP_Instance instance,
@@ -80,14 +80,14 @@ RealPepperInterface::RealPepperInterface(PP_Instance instance,
   assert(core_interface_);
   assert(message_loop_interface_);
 
-#include "nacl_mounts/pepper/undef_macros.h"
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/undef_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     BaseClass##interface_ = new Real##BaseClass( \
         static_cast<const PPInterface*>( \
             get_browser_interface(InterfaceString)));
-#include "nacl_mounts/pepper/all_interfaces.h"
+#include "nacl_io/pepper/all_interfaces.h"
 }
 
 PP_Instance RealPepperInterface::GetInstance() {
@@ -105,14 +105,14 @@ void RealPepperInterface::ReleaseResource(PP_Resource resource) {
 }
 
 // Define getter function.
-#include "nacl_mounts/pepper/undef_macros.h"
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/undef_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     BaseClass* RealPepperInterface::Get##BaseClass() { \
       return BaseClass##interface_; \
     }
-#include "nacl_mounts/pepper/all_interfaces.h"
+#include "nacl_io/pepper/all_interfaces.h"
 
 
 int32_t RealPepperInterface::InitializeMessageLoop() {
diff --git a/native_client_sdk/src/libraries/nacl_mounts/real_pepper_interface.h b/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h
index e51dff3..09346ce 100644
--- a/native_client_sdk/src/libraries/nacl_mounts/real_pepper_interface.h
+++ b/native_client_sdk/src/libraries/nacl_io/real_pepper_interface.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_REAL_PEPPER_INTERFACE_H_
-#define LIBRARIES_NACL_MOUNTS_REAL_PEPPER_INTERFACE_H_
+#ifndef LIBRARIES_NACL_IO_REAL_PEPPER_INTERFACE_H_
+#define LIBRARIES_NACL_IO_REAL_PEPPER_INTERFACE_H_
 
 #include <ppapi/c/ppb.h>
 #include <ppapi/c/ppb_core.h>
@@ -11,12 +11,12 @@
 #include "pepper_interface.h"
 
 // Forward declare interface classes.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     class Real##BaseClass;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
 class RealPepperInterface : public PepperInterface {
  public:
@@ -28,12 +28,12 @@ class RealPepperInterface : public PepperInterface {
   virtual void ReleaseResource(PP_Resource);
 
 // Interface getters.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     virtual BaseClass* Get##BaseClass();
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
   int32_t InitializeMessageLoop();
 
@@ -43,12 +43,12 @@ class RealPepperInterface : public PepperInterface {
   const PPB_MessageLoop* message_loop_interface_;
 
 // Interface pointers.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     Real##BaseClass* BaseClass##interface_;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_REAL_PEPPER_INTERFACE_H_
+#endif  // LIBRARIES_NACL_IO_REAL_PEPPER_INTERFACE_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/Makefile b/native_client_sdk/src/libraries/nacl_io_test/Makefile
index 2797405..e590690 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/Makefile
+++ b/native_client_sdk/src/libraries/nacl_io_test/Makefile
@@ -41,7 +41,7 @@ include $(NACL_SDK_ROOT)/tools/common.mk
 # We break this list down into two parts, the set we need to rebuild (DEPS)
 # and the set we do not.
 #
-DEPS=nacl_mounts ppapi_cpp
+DEPS=nacl_io ppapi_cpp
 # Order matters here: gtest has a "main" function that will be used if
 # referenced before ppapi.
 LIBS=gtest_ppapi $(DEPS) gmock ppapi gtest pthread
@@ -57,7 +57,7 @@ $(foreach dep,$(DEPS),$(eval $(call DEPEND_RULE,$(dep))))
 # The base name of the final NEXE, also the name of the NMF file containing
 # the mapping between architecture and actual NEXE.
 #
-TARGET=nacl_mounts_test
+TARGET=nacl_io_test
 
 #
 # List of sources to compile
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/example.dsc b/native_client_sdk/src/libraries/nacl_io_test/example.dsc
index 5b9150e..20fca3b 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/example.dsc
+++ b/native_client_sdk/src/libraries/nacl_io_test/example.dsc
@@ -6,7 +6,7 @@
   'SEARCH': ['.', '../../examples'],
   'TARGETS': [
     {
-      'NAME' : 'nacl_mounts_test',
+      'NAME' : 'nacl_io_test',
       'TYPE' : 'main',
       'SOURCES' : [
         'kernel_object_test.cc',
@@ -23,7 +23,7 @@
         'pepper_interface_mock.cc',
         'pepper_interface_mock.h',
       ],
-      'LIBS': ['ppapi', 'pthread', 'gtest', 'gmock', 'nacl_mounts', 'ppapi_cpp', 'gtest_ppapi']
+      'LIBS': ['ppapi', 'pthread', 'gtest', 'gmock', 'nacl_io', 'ppapi_cpp', 'gtest_ppapi']
     }
   ],
   'DATA': [
@@ -31,6 +31,6 @@
     'example.js'
   ],
   'DEST': 'tests',
-  'NAME': 'nacl_mounts_test',
-  'TITLE': 'NaCl Mounts test',
+  'NAME': 'nacl_io_test',
+  'TITLE': 'NaCl IO test',
 }
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/example.js b/native_client_sdk/src/libraries/nacl_io_test/example.js
index 4e7cb0a..4e7cb0a 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/example.js
+++ b/native_client_sdk/src/libraries/nacl_io_test/example.js
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/index.html b/native_client_sdk/src/libraries/nacl_io_test/index.html
index 5d2cf08..5d2cf08 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/index.html
+++ b/native_client_sdk/src/libraries/nacl_io_test/index.html
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_object_test.cc b/native_client_sdk/src/libraries/nacl_io_test/kernel_object_test.cc
index d67243c..e2c9f39 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_object_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/kernel_object_test.cc
@@ -11,10 +11,10 @@
 #include <map>
 #include <string>
 
-#include "nacl_mounts/kernel_handle.h"
-#include "nacl_mounts/kernel_object.h"
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/kernel_handle.h"
+#include "nacl_io/kernel_object.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/path.h"
 
 #include "gtest/gtest.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_mock.cc b/native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_mock.cc
index f07a11e..5c4db1d 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_mock.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_mock.cc
@@ -4,7 +4,7 @@
  */
 
 #include "kernel_proxy_mock.h"
-#include "nacl_mounts/kernel_intercept.h"
+#include "nacl_io/kernel_intercept.h"
 
 KernelProxyMock::KernelProxyMock() {
 }
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_mock.h b/native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_mock.h
index 5c1da16..c2f7dc3 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_mock.h
+++ b/native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_mock.h
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#ifndef LIBRARIES_NACL_MOUNTS_TEST_KERNEL_PROXY_MOCK_H_
-#define LIBRARIES_NACL_MOUNTS_TEST_KERNEL_PROXY_MOCK_H_
+#ifndef LIBRARIES_NACL_IO_TEST_KERNEL_PROXY_MOCK_H_
+#define LIBRARIES_NACL_IO_TEST_KERNEL_PROXY_MOCK_H_
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "gmock/gmock.h"
 
-#include "nacl_mounts/kernel_proxy.h"
+#include "nacl_io/kernel_proxy.h"
 
 class KernelProxyMock : public KernelProxy {
  public:
@@ -45,4 +45,4 @@ class KernelProxyMock : public KernelProxy {
   MOCK_METHOD2(symlink, int(const char*, const char*));
 };
 
-#endif  // LIBRARIES_NACL_MOUNTS_TEST_KERNEL_PROXY_MOCK_H_
+#endif  // LIBRARIES_NACL_IO_TEST_KERNEL_PROXY_MOCK_H_
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc b/native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_test.cc
index a63f5a0..f1e1e81 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/kernel_proxy_test.cc
@@ -11,12 +11,12 @@
 #include <map>
 #include <string>
 
-#include "nacl_mounts/kernel_handle.h"
-#include "nacl_mounts/kernel_intercept.h"
-#include "nacl_mounts/kernel_proxy.h"
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/mount_mem.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/kernel_handle.h"
+#include "nacl_io/kernel_intercept.h"
+#include "nacl_io/kernel_proxy.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/mount_mem.h"
+#include "nacl_io/path.h"
 
 #include "gtest/gtest.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_wrap_test.cc b/native_client_sdk/src/libraries/nacl_io_test/kernel_wrap_test.cc
index 41b10bd..df7a784 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_wrap_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/kernel_wrap_test.cc
@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 #include "gtest/gtest.h"
-#include "nacl_mounts/kernel_proxy.h"
-#include "nacl_mounts/kernel_intercept.h"
-#include "nacl_mounts/kernel_wrap.h"
+#include "nacl_io/kernel_proxy.h"
+#include "nacl_io/kernel_intercept.h"
+#include "nacl_io/kernel_wrap.h"
 #include "kernel_proxy_mock.h"
 
 using ::testing::StrEq;
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/module.cc b/native_client_sdk/src/libraries/nacl_io_test/module.cc
index 0eee65f..0eee65f 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/module.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/module.cc
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/mount_html5fs_test.cc b/native_client_sdk/src/libraries/nacl_io_test/mount_html5fs_test.cc
index 0125b6a..259d6ae 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/mount_html5fs_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/mount_html5fs_test.cc
@@ -9,8 +9,8 @@
 #include <ppapi/c/pp_errors.h>
 #include <ppapi/c/pp_instance.h>
 
-#include "nacl_mounts/mount_html5fs.h"
-#include "nacl_mounts/osdirent.h"
+#include "nacl_io/mount_html5fs.h"
+#include "nacl_io/osdirent.h"
 #include "pepper_interface_mock.h"
 
 using ::testing::_;
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/mount_http_test.cc b/native_client_sdk/src/libraries/nacl_io_test/mount_http_test.cc
index 05030ea..edf35cb 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/mount_http_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/mount_http_test.cc
@@ -11,10 +11,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "nacl_mounts/kernel_intercept.h"
-#include "nacl_mounts/mount_http.h"
-#include "nacl_mounts/mount_node_dir.h"
-#include "nacl_mounts/osdirent.h"
+#include "nacl_io/kernel_intercept.h"
+#include "nacl_io/mount_http.h"
+#include "nacl_io/mount_node_dir.h"
+#include "nacl_io/osdirent.h"
 #include "pepper_interface_mock.h"
 
 using ::testing::_;
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/mount_node_test.cc b/native_client_sdk/src/libraries/nacl_io_test/mount_node_test.cc
index 9342798..d0072ce 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/mount_node_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/mount_node_test.cc
@@ -6,11 +6,11 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "nacl_mounts/kernel_proxy.h"
-#include "nacl_mounts/mount_node.h"
-#include "nacl_mounts/mount_node_dir.h"
-#include "nacl_mounts/mount_node_mem.h"
-#include "nacl_mounts/osdirent.h"
+#include "nacl_io/kernel_proxy.h"
+#include "nacl_io/mount_node.h"
+#include "nacl_io/mount_node_dir.h"
+#include "nacl_io/mount_node_mem.h"
+#include "nacl_io/osdirent.h"
 
 #include "gtest/gtest.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/mount_test.cc b/native_client_sdk/src/libraries/nacl_io_test/mount_test.cc
index 34c7ce6a..3b8df4d 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/mount_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/mount_test.cc
@@ -9,10 +9,10 @@
 #include <string>
 #include <sys/stat.h>
 
-#include "nacl_mounts/mount.h"
-#include "nacl_mounts/mount_dev.h"
-#include "nacl_mounts/mount_mem.h"
-#include "nacl_mounts/osdirent.h"
+#include "nacl_io/mount.h"
+#include "nacl_io/mount_dev.h"
+#include "nacl_io/mount_mem.h"
+#include "nacl_io/osdirent.h"
 
 #include "gtest/gtest.h"
 
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/nacl_mounts_test.vcproj.GOOGLE.noelallen.user b/native_client_sdk/src/libraries/nacl_io_test/nacl_mounts_test.vcproj.GOOGLE.noelallen.user
index 1d5bc9b..1d5bc9b 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/nacl_mounts_test.vcproj.GOOGLE.noelallen.user
+++ b/native_client_sdk/src/libraries/nacl_io_test/nacl_mounts_test.vcproj.GOOGLE.noelallen.user
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/path_test.cc b/native_client_sdk/src/libraries/nacl_io_test/path_test.cc
index ea89d42..3f8c918 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/path_test.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/path_test.cc
@@ -4,8 +4,8 @@
  */
 
 #include <fcntl.h>
-#include "nacl_mounts/kernel_proxy.h"
-#include "nacl_mounts/path.h"
+#include "nacl_io/kernel_proxy.h"
+#include "nacl_io/path.h"
 
 #include "gtest/gtest.h"
 
@@ -229,7 +229,7 @@ TEST(PathTest, Invalid) {
   test = current;
   test.Append("../../../foo");
   EXPECT_EQ("../foo", test.Join());
- 
+
   test = relative;
   test.Append("../..");
   EXPECT_EQ(".", test.Join());
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/pepper_interface_mock.cc b/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc
index ad0af97..0822028 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/pepper_interface_mock.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc
@@ -9,12 +9,12 @@ PepperInterfaceMock::PepperInterfaceMock(PP_Instance instance)
     : instance_(instance),
 
     // Initialize interfaces.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     BaseClass##interface_(new BaseClass##Mock),
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
     // Dummy value so we can ensure that no interface ends the initializer list.
     dummy_(0) {
@@ -23,12 +23,12 @@ PepperInterfaceMock::PepperInterfaceMock(PP_Instance instance)
 PepperInterfaceMock::~PepperInterfaceMock() {
 
   // Delete interfaces.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     delete BaseClass##interface_;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
 }
 
@@ -37,7 +37,7 @@ PP_Instance PepperInterfaceMock::GetInstance() {
 }
 
 // Define Getter functions, constructors, destructors.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     BaseClass##Mock* PepperInterfaceMock::Get##BaseClass() { \
@@ -47,5 +47,5 @@ PP_Instance PepperInterfaceMock::GetInstance() {
     } \
     BaseClass##Mock::~BaseClass##Mock() { \
     }
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/pepper_interface_mock.h b/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.h
index bd2ab53..0fe3743 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/pepper_interface_mock.h
+++ b/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.h
@@ -2,11 +2,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef LIBRARIES_NACL_MOUNTS_TEST_PEPPER_INTERFACE_MOCK_H_
-#define LIBRARIES_NACL_MOUNTS_TEST_PEPPER_INTERFACE_MOCK_H_
+#ifndef LIBRARIES_NACL_IO_TEST_PEPPER_INTERFACE_MOCK_H_
+#define LIBRARIES_NACL_IO_TEST_PEPPER_INTERFACE_MOCK_H_
 
 #include "gmock/gmock.h"
-#include "nacl_mounts/pepper_interface.h"
+#include "nacl_io/pepper_interface.h"
 
 // Mock interface class definitions.
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
@@ -27,8 +27,8 @@
 #define METHOD5(Class, ReturnType, MethodName, Type0, Type1, Type2, Type3, \
                 Type4) \
     MOCK_METHOD5(MethodName, ReturnType(Type0, Type1, Type2, Type3, Type4));
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
 
 class PepperInterfaceMock : public PepperInterface {
@@ -41,26 +41,26 @@ class PepperInterfaceMock : public PepperInterface {
   MOCK_METHOD1(ReleaseResource, void(PP_Resource));
 
 // Interface getters.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     virtual BaseClass##Mock* Get##BaseClass();
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
  private:
   PP_Instance instance_;
 
 // Interface pointers.
-#include "nacl_mounts/pepper/define_empty_macros.h"
+#include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     BaseClass##Mock* BaseClass##interface_;
-#include "nacl_mounts/pepper/all_interfaces.h"
-#include "nacl_mounts/pepper/undef_macros.h"
+#include "nacl_io/pepper/all_interfaces.h"
+#include "nacl_io/pepper/undef_macros.h"
 
   int dummy_;
 };
 
 
-#endif  // LIBRARIES_NACL_MOUNTS_TEST_PEPPER_INTERFACE_MOCK_H_
+#endif  // LIBRARIES_NACL_IO_TEST_PEPPER_INTERFACE_MOCK_H_
diff --git a/native_client_sdk/src/libraries/ppapi_main/ppapi_instance.cc b/native_client_sdk/src/libraries/ppapi_main/ppapi_instance.cc
index 5bd92d2..64e3d16 100644
--- a/native_client_sdk/src/libraries/ppapi_main/ppapi_instance.cc
+++ b/native_client_sdk/src/libraries/ppapi_main/ppapi_instance.cc
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "nacl_mounts/kernel_wrap.h"
-#include "nacl_mounts/nacl_mounts.h"
+#include "nacl_io/kernel_wrap.h"
+#include "nacl_io/nacl_io.h"
 
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/message_loop.h"
@@ -157,7 +157,7 @@ bool PPAPIInstance::ProcessProperties() {
   if (queue_size_int < 4) queue_size_int = 4;
   event_queue_.SetSize(queue_size_int);
 
-  nacl_mounts_init_ppapi(PPAPI_GetInstanceId(), PPAPI_GetInterface);
+  nacl_io_init_ppapi(PPAPI_GetInstanceId(), PPAPI_GetInterface);
   int fd0 = open(stdin_path, O_RDONLY);
   int fd1 = open(stdout_path, O_WRONLY);
   int fd2 = open(stderr_path, O_WRONLY);
diff --git a/native_client_sdk/src/libraries/ppapi_main/ppapi_instance3d.cc b/native_client_sdk/src/libraries/ppapi_main/ppapi_instance3d.cc
index 068f39f..ef8092e 100644
--- a/native_client_sdk/src/libraries/ppapi_main/ppapi_instance3d.cc
+++ b/native_client_sdk/src/libraries/ppapi_main/ppapi_instance3d.cc
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "nacl_mounts/nacl_mounts.h"
+#include "nacl_io/nacl_io.h"
 
 #include "ppapi/cpp/fullscreen.h"
 #include "ppapi/cpp/graphics_3d.h"