diff --git a/.gitignore b/.gitignore
index 3edebd421445dc..e9247cd855af79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,6 @@ v8.log
 /third_party/adobe/flash/binaries
 /third_party/angle
 /third_party/cacheinvalidation/files
-/third_party/cacheinvalidation/files2
 /third_party/chromeos_login_manager
 /third_party/chromeos_text_input
 /third_party/cros
diff --git a/DEPS b/DEPS
index 9d1e508f6a813a..771b65a4d69dc8 100644
--- a/DEPS
+++ b/DEPS
@@ -60,8 +60,7 @@ deps = {
   "src/third_party/safe_browsing/testing":
     (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106",
 
-  # TODO(akalin): Rename files2 -> files.
-  "src/third_party/cacheinvalidation/files2/src/google":
+  "src/third_party/cacheinvalidation/files/src/google":
     (Var("googlecode_url") % "google-cache-invalidation-api") +
     "/trunk/src/google@80",
 
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 15e2d4c44a990b..bfac523b59002e 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -2,15 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(akalin): Rename files2 -> files.
-
 {
   'variables': {
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
     # The root directory for the proto files.
-    'proto_dir_root': 'files2/src',
+    'proto_dir_root': 'files/src',
     # The relative path of the cacheinvalidation proto files from
     # proto_dir_root.
     # TODO(akalin): Add a RULE_INPUT_DIR predefined variable to gyp so
@@ -86,33 +84,33 @@
         'overrides/google/cacheinvalidation/stl-namespace.h',
         'overrides/google/cacheinvalidation/string_util.h',
         'overrides/google/cacheinvalidation/time.h',
-        'files2/src/google/cacheinvalidation/invalidation-client-impl.cc',
-        'files2/src/google/cacheinvalidation/invalidation-client-impl.h',
-        'files2/src/google/cacheinvalidation/invalidation-client.cc',
-        'files2/src/google/cacheinvalidation/invalidation-client.h',
-        'files2/src/google/cacheinvalidation/invalidation-types.h',
-        'files2/src/google/cacheinvalidation/log-macro.h',
-        'files2/src/google/cacheinvalidation/network-manager.cc',
-        'files2/src/google/cacheinvalidation/network-manager.h',
-        'files2/src/google/cacheinvalidation/persistence-manager.cc',
-        'files2/src/google/cacheinvalidation/persistence-manager.h',
-        'files2/src/google/cacheinvalidation/persistence-utils.cc',
-        'files2/src/google/cacheinvalidation/persistence-utils.h',
-        'files2/src/google/cacheinvalidation/proto-converter.cc',
-        'files2/src/google/cacheinvalidation/proto-converter.h',
-        'files2/src/google/cacheinvalidation/registration-update-manager.cc',
-        'files2/src/google/cacheinvalidation/registration-update-manager.h',
-        'files2/src/google/cacheinvalidation/session-manager.cc',
-        'files2/src/google/cacheinvalidation/session-manager.h',
-        'files2/src/google/cacheinvalidation/throttle.cc',
-        'files2/src/google/cacheinvalidation/throttle.h',
-        'files2/src/google/cacheinvalidation/version-manager.cc',
-        'files2/src/google/cacheinvalidation/version-manager.h',
+        'files/src/google/cacheinvalidation/invalidation-client-impl.cc',
+        'files/src/google/cacheinvalidation/invalidation-client-impl.h',
+        'files/src/google/cacheinvalidation/invalidation-client.cc',
+        'files/src/google/cacheinvalidation/invalidation-client.h',
+        'files/src/google/cacheinvalidation/invalidation-types.h',
+        'files/src/google/cacheinvalidation/log-macro.h',
+        'files/src/google/cacheinvalidation/network-manager.cc',
+        'files/src/google/cacheinvalidation/network-manager.h',
+        'files/src/google/cacheinvalidation/persistence-manager.cc',
+        'files/src/google/cacheinvalidation/persistence-manager.h',
+        'files/src/google/cacheinvalidation/persistence-utils.cc',
+        'files/src/google/cacheinvalidation/persistence-utils.h',
+        'files/src/google/cacheinvalidation/proto-converter.cc',
+        'files/src/google/cacheinvalidation/proto-converter.h',
+        'files/src/google/cacheinvalidation/registration-update-manager.cc',
+        'files/src/google/cacheinvalidation/registration-update-manager.h',
+        'files/src/google/cacheinvalidation/session-manager.cc',
+        'files/src/google/cacheinvalidation/session-manager.h',
+        'files/src/google/cacheinvalidation/throttle.cc',
+        'files/src/google/cacheinvalidation/throttle.h',
+        'files/src/google/cacheinvalidation/version-manager.cc',
+        'files/src/google/cacheinvalidation/version-manager.h',
       ],
       'include_dirs': [
         '<(protoc_out_dir)',
         './overrides',
-        './files2/src',
+        './files/src',
       ],
       'dependencies': [
         '../../base/base.gyp:base',
@@ -126,7 +124,7 @@
         'include_dirs': [
           '<(protoc_out_dir)',
           './overrides',
-          './files2/src',
+          './files/src',
         ],
       },
       'export_dependent_settings': [
@@ -140,11 +138,11 @@
       'type': 'executable',
       'sources': [
         '../../base/test/run_all_unittests.cc',
-        'files2/src/google/cacheinvalidation/system-resources-for-test.h',
-        'files2/src/google/cacheinvalidation/invalidation-client-impl_test.cc',
-        'files2/src/google/cacheinvalidation/persistence-manager_test.cc',
-        'files2/src/google/cacheinvalidation/persistence-utils_test.cc',
-        'files2/src/google/cacheinvalidation/throttle_test.cc',
+        'files/src/google/cacheinvalidation/system-resources-for-test.h',
+        'files/src/google/cacheinvalidation/invalidation-client-impl_test.cc',
+        'files/src/google/cacheinvalidation/persistence-manager_test.cc',
+        'files/src/google/cacheinvalidation/persistence-utils_test.cc',
+        'files/src/google/cacheinvalidation/throttle_test.cc',
       ],
       'dependencies': [
         '../../base/base.gyp:base',