diff --git a/minidump/minidump.gyp b/minidump/minidump.gyp
index 6763183c..f6bf10b7 100644
--- a/minidump/minidump.gyp
+++ b/minidump/minidump.gyp
@@ -34,8 +34,6 @@
         'minidump_context_writer.h',
         'minidump_crashpad_info_writer.cc',
         'minidump_crashpad_info_writer.h',
-        'minidump_crashpad_module_writer.cc',
-        'minidump_crashpad_module_writer.h',
         'minidump_exception_writer.cc',
         'minidump_exception_writer.h',
         'minidump_extensions.cc',
@@ -46,6 +44,8 @@
         'minidump_memory_writer.h',
         'minidump_misc_info_writer.cc',
         'minidump_misc_info_writer.h',
+        'minidump_module_crashpad_info_writer.cc',
+        'minidump_module_crashpad_info_writer.h',
         'minidump_module_writer.cc',
         'minidump_module_writer.h',
         'minidump_simple_string_dictionary_writer.cc',
@@ -79,11 +79,11 @@
       'sources': [
         'minidump_context_writer_test.cc',
         'minidump_crashpad_info_writer_test.cc',
-        'minidump_crashpad_module_writer_test.cc',
         'minidump_exception_writer_test.cc',
         'minidump_file_writer_test.cc',
         'minidump_memory_writer_test.cc',
         'minidump_misc_info_writer_test.cc',
+        'minidump_module_crashpad_info_writer_test.cc',
         'minidump_module_writer_test.cc',
         'minidump_simple_string_dictionary_writer_test.cc',
         'minidump_string_writer_test.cc',
diff --git a/minidump/minidump_crashpad_info_writer.cc b/minidump/minidump_crashpad_info_writer.cc
index 4d910b44..5114843c 100644
--- a/minidump/minidump_crashpad_info_writer.cc
+++ b/minidump/minidump_crashpad_info_writer.cc
@@ -15,7 +15,7 @@
 #include "minidump/minidump_crashpad_info_writer.h"
 
 #include "base/logging.h"
-#include "minidump/minidump_crashpad_module_writer.h"
+#include "minidump/minidump_module_crashpad_info_writer.h"
 #include "util/file/file_writer.h"
 
 namespace crashpad {
diff --git a/minidump/minidump_crashpad_info_writer_test.cc b/minidump/minidump_crashpad_info_writer_test.cc
index e61f3bb2..bbc9ce3e 100644
--- a/minidump/minidump_crashpad_info_writer_test.cc
+++ b/minidump/minidump_crashpad_info_writer_test.cc
@@ -17,9 +17,9 @@
 #include <dbghelp.h>
 
 #include "gtest/gtest.h"
-#include "minidump/minidump_crashpad_module_writer.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
+#include "minidump/minidump_module_crashpad_info_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file_writer.h"
diff --git a/minidump/minidump_crashpad_module_writer.cc b/minidump/minidump_module_crashpad_info_writer.cc
similarity index 98%
rename from minidump/minidump_crashpad_module_writer.cc
rename to minidump/minidump_module_crashpad_info_writer.cc
index 5e89e8de..eae793bb 100644
--- a/minidump/minidump_crashpad_module_writer.cc
+++ b/minidump/minidump_module_crashpad_info_writer.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "minidump/minidump_crashpad_module_writer.h"
+#include "minidump/minidump_module_crashpad_info_writer.h"
 
 #include <sys/types.h>
 
diff --git a/minidump/minidump_crashpad_module_writer.h b/minidump/minidump_module_crashpad_info_writer.h
similarity index 94%
rename from minidump/minidump_crashpad_module_writer.h
rename to minidump/minidump_module_crashpad_info_writer.h
index 4541111f..7c84fa0c 100644
--- a/minidump/minidump_crashpad_module_writer.h
+++ b/minidump/minidump_module_crashpad_info_writer.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_MODULE_WRITER_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_MODULE_WRITER_H_
+#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_
+#define CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_
 
 #include <stdint.h>
 
@@ -99,4 +99,4 @@ class MinidumpModuleCrashpadInfoListWriter final
 
 }  // namespace crashpad
 
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_MODULE_WRITER_H_
+#endif  // CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_
diff --git a/minidump/minidump_crashpad_module_writer_test.cc b/minidump/minidump_module_crashpad_info_writer_test.cc
similarity index 99%
rename from minidump/minidump_crashpad_module_writer_test.cc
rename to minidump/minidump_module_crashpad_info_writer_test.cc
index 3eadcbcf..f52c4e0d 100644
--- a/minidump/minidump_crashpad_module_writer_test.cc
+++ b/minidump/minidump_module_crashpad_info_writer_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "minidump/minidump_crashpad_module_writer.h"
+#include "minidump/minidump_module_crashpad_info_writer.h"
 
 #include <dbghelp.h>