diff --git a/.gitignore b/.gitignore
index cb0347fc51..b8ba4892a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ src/Makefile
 /config.h
 config.log
 config.status
+pbconfig.h
 
 libtool
 protobuf-lite.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a27b8235c..7811b0ae49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -322,7 +322,7 @@ protoc_inputs =                                                \
   google/protobuf/unittest_preserve_unknown_enum2.proto        \
   google/protobuf/unittest_proto3_arena.proto                  \
   google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto  \
-  google/protobuf/compiler/cpp/test_large_enum_value.proto
+  google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
 
 EXTRA_DIST =                                                   \
   $(protoc_inputs)                                             \
@@ -398,8 +398,8 @@ protoc_outputs =                                               \
   google/protobuf/unittest_preserve_unknown_enum2.pb.h         \
   google/protobuf/unittest_proto3_arena.pb.cc                  \
   google/protobuf/unittest_proto3_arena.pb.h                   \
-  google/protobuf/compiler/cpp/test_large_enum_value.pb.cc     \
-  google/protobuf/compiler/cpp/test_large_enum_value.pb.h      \
+  google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.cc \
+  google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.h  \
   google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc  \
   google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h
 
diff --git a/src/google/protobuf/compiler/cpp/test_large_enum_value.proto b/src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
similarity index 100%
rename from src/google/protobuf/compiler/cpp/test_large_enum_value.proto
rename to src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto