diff --git a/.gitmodules b/.gitmodules
index 73b12931d77f..970e215f723b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "vendor/breakpad"]
 	path = vendor/breakpad
 	url = https://github.com/electron/chromium-breakpad.git
-[submodule "vendor/native_mate"]
-	path = vendor/native_mate
-	url = https://github.com/electron/native-mate.git
 [submodule "vendor/crashpad"]
 	path = vendor/crashpad
 	url = https://github.com/electron/crashpad.git
diff --git a/native_mate/mate/arguments.cc b/native_mate/native_mate/arguments.cc
similarity index 100%
rename from native_mate/mate/arguments.cc
rename to native_mate/native_mate/arguments.cc
diff --git a/native_mate/mate/arguments.h b/native_mate/native_mate/arguments.h
similarity index 100%
rename from native_mate/mate/arguments.h
rename to native_mate/native_mate/arguments.h
diff --git a/native_mate/mate/constructor.h b/native_mate/native_mate/constructor.h
similarity index 100%
rename from native_mate/mate/constructor.h
rename to native_mate/native_mate/constructor.h
diff --git a/native_mate/mate/converter.cc b/native_mate/native_mate/converter.cc
similarity index 100%
rename from native_mate/mate/converter.cc
rename to native_mate/native_mate/converter.cc
diff --git a/native_mate/mate/converter.h b/native_mate/native_mate/converter.h
similarity index 100%
rename from native_mate/mate/converter.h
rename to native_mate/native_mate/converter.h
diff --git a/native_mate/mate/dictionary.cc b/native_mate/native_mate/dictionary.cc
similarity index 100%
rename from native_mate/mate/dictionary.cc
rename to native_mate/native_mate/dictionary.cc
diff --git a/native_mate/mate/dictionary.h b/native_mate/native_mate/dictionary.h
similarity index 100%
rename from native_mate/mate/dictionary.h
rename to native_mate/native_mate/dictionary.h
diff --git a/native_mate/mate/function_template.cc b/native_mate/native_mate/function_template.cc
similarity index 100%
rename from native_mate/mate/function_template.cc
rename to native_mate/native_mate/function_template.cc
diff --git a/native_mate/mate/function_template.h b/native_mate/native_mate/function_template.h
similarity index 100%
rename from native_mate/mate/function_template.h
rename to native_mate/native_mate/function_template.h
diff --git a/native_mate/mate/handle.h b/native_mate/native_mate/handle.h
similarity index 100%
rename from native_mate/mate/handle.h
rename to native_mate/native_mate/handle.h
diff --git a/native_mate/mate/object_template_builder.cc b/native_mate/native_mate/object_template_builder.cc
similarity index 100%
rename from native_mate/mate/object_template_builder.cc
rename to native_mate/native_mate/object_template_builder.cc
diff --git a/native_mate/mate/object_template_builder.h b/native_mate/native_mate/object_template_builder.h
similarity index 100%
rename from native_mate/mate/object_template_builder.h
rename to native_mate/native_mate/object_template_builder.h
diff --git a/native_mate/mate/persistent_dictionary.cc b/native_mate/native_mate/persistent_dictionary.cc
similarity index 100%
rename from native_mate/mate/persistent_dictionary.cc
rename to native_mate/native_mate/persistent_dictionary.cc
diff --git a/native_mate/mate/persistent_dictionary.h b/native_mate/native_mate/persistent_dictionary.h
similarity index 100%
rename from native_mate/mate/persistent_dictionary.h
rename to native_mate/native_mate/persistent_dictionary.h
diff --git a/native_mate/mate/promise.cc b/native_mate/native_mate/promise.cc
similarity index 100%
rename from native_mate/mate/promise.cc
rename to native_mate/native_mate/promise.cc
diff --git a/native_mate/mate/promise.h b/native_mate/native_mate/promise.h
similarity index 100%
rename from native_mate/mate/promise.h
rename to native_mate/native_mate/promise.h
diff --git a/native_mate/mate/scoped_persistent.h b/native_mate/native_mate/scoped_persistent.h
similarity index 100%
rename from native_mate/mate/scoped_persistent.h
rename to native_mate/native_mate/scoped_persistent.h
diff --git a/native_mate/mate/wrappable.cc b/native_mate/native_mate/wrappable.cc
similarity index 100%
rename from native_mate/mate/wrappable.cc
rename to native_mate/native_mate/wrappable.cc
diff --git a/native_mate/mate/wrappable.h b/native_mate/native_mate/wrappable.h
similarity index 100%
rename from native_mate/mate/wrappable.h
rename to native_mate/native_mate/wrappable.h
diff --git a/native_mate/mate/wrappable_base.h b/native_mate/native_mate/wrappable_base.h
similarity index 100%
rename from native_mate/mate/wrappable_base.h
rename to native_mate/native_mate/wrappable_base.h
diff --git a/native_mate/native_mate_files.gypi b/native_mate/native_mate_files.gypi
index 6756a5ad1d08..d7e9374971ca 100644
--- a/native_mate/native_mate_files.gypi
+++ b/native_mate/native_mate_files.gypi
@@ -1,26 +1,26 @@
 {
   'variables': {
     'native_mate_files': [
-      'mate/arguments.cc',
-      'mate/arguments.h',
-      'mate/constructor.h',
-      'mate/converter.cc',
-      'mate/converter.h',
-      'mate/dictionary.cc',
-      'mate/dictionary.h',
-      'mate/function_template.cc',
-      'mate/function_template.h',
-      'mate/handle.h',
-      'mate/object_template_builder.cc',
-      'mate/object_template_builder.h',
-      'mate/persistent_dictionary.cc',
-      'mate/persistent_dictionary.h',
-      'mate/scoped_persistent.h',
-      'mate/wrappable.cc',
-      'mate/wrappable.h',
-      'mate/wrappable_base.h',
-      'mate/promise.h',
-      'mate/promise.cc',
+      'native_mate/arguments.cc',
+      'native_mate/arguments.h',
+      'native_mate/constructor.h',
+      'native_mate/converter.cc',
+      'native_mate/converter.h',
+      'native_mate/dictionary.cc',
+      'native_mate/dictionary.h',
+      'native_mate/function_template.cc',
+      'native_mate/function_template.h',
+      'native_mate/handle.h',
+      'native_mate/object_template_builder.cc',
+      'native_mate/object_template_builder.h',
+      'native_mate/persistent_dictionary.cc',
+      'native_mate/persistent_dictionary.h',
+      'native_mate/scoped_persistent.h',
+      'native_mate/wrappable.cc',
+      'native_mate/wrappable.h',
+      'native_mate/wrappable_base.h',
+      'native_mate/promise.h',
+      'native_mate/promise.cc',
     ],
   },
 }