9 files changed, 14 insertions, 14 deletions
diff --git a/configure.py b/configure.py
index 5329708..6fb718f 100755
--- a/configure.py
+++ b/configure.py
@@ -236,8 +236,8 @@ for name in ['build',
              'graph',
              'graphviz',
              'lexer',
+             'manifest_parser',
              'metrics',
-             'parsers',
              'state',
              'util']:
     objs += cxx(name)
@@ -305,7 +305,7 @@ for name in ['build_log_test',
              'edit_distance_test',
              'graph_test',
              'lexer_test',
-             'parsers_test',
+             'manifest_parser_test',
              'state_test',
              'subprocess_test',
              'test',
diff --git a/misc/ninja.vim b/misc/ninja.vim
index 51a95c2..6f0e48d 100644
--- a/misc/ninja.vim
+++ b/misc/ninja.vim
@@ -10,7 +10,7 @@
 
 " ninja lexer and parser are at
 " https://github.com/martine/ninja/blob/master/src/lexer.in.cc
-" https://github.com/martine/ninja/blob/master/src/parsers.cc
+" https://github.com/martine/ninja/blob/master/src/manifest_parser.cc
 
 if exists("b:current_syntax")
   finish
@@ -22,7 +22,7 @@ syn match ninjaComment /#.*/  contains=@Spell
 
 " Toplevel statements are the ones listed here and
 " toplevel variable assignments (ident '=' value).
-" lexer.in.cc, ReadToken() and parsers.cc, Parse()
+" lexer.in.cc, ReadToken() and manifest_parser.cc, Parse()
 syn match ninjaKeyword "^build\>"
 syn match ninjaKeyword "^rule\>"
 syn match ninjaKeyword "^default\>"
@@ -33,7 +33,7 @@ syn match ninjaKeyword "^subninja\>"
 " on the first line without indent. 'rule' allows only a
 " limited set of magic variables, 'build' allows general
 " let assignments.
-" parsers.cc, ParseRule()
+" manifest_parser.cc, ParseRule()
 syn region ninjaRule start="^rule" end="^\ze\S" contains=ALL transparent
 syn keyword ninjaRuleCommand contained command depfile description generator restat
 
diff --git a/src/build_log_perftest.cc b/src/build_log_perftest.cc
index 51bb51b..02f4c60 100644
--- a/src/build_log_perftest.cc
+++ b/src/build_log_perftest.cc
@@ -17,7 +17,7 @@
 
 #include "build_log.h"
 #include "graph.h"
-#include "parsers.h"
+#include "manifest_parser.h"
 #include "state.h"
 #include "util.h"
 
diff --git a/src/graph.cc b/src/graph.cc
index 56584e3..071a3b6 100644
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -21,8 +21,8 @@
 #include "depfile_parser.h"
 #include "disk_interface.h"
 #include "explain.h"
+#include "manifest_parser.h"
 #include "metrics.h"
-#include "parsers.h"
 #include "state.h"
 #include "util.h"
 
diff --git a/src/parsers.cc b/src/manifest_parser.cc
index bc76ba1..057e12c 100644
--- a/src/parsers.cc
+++ b/src/manifest_parser.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "parsers.h"
+#include "manifest_parser.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/parsers.h b/src/manifest_parser.h
index f889156..a2c6c93 100644
--- a/src/parsers.h
+++ b/src/manifest_parser.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef NINJA_PARSERS_H_
-#define NINJA_PARSERS_H_
+#ifndef NINJA_MANIFEST_PARSER_H_
+#define NINJA_MANIFEST_PARSER_H_
 
 #include <string>
 #include <vector>
@@ -68,4 +68,4 @@ private:
   Lexer lexer_;
 };
 
-#endif  // NINJA_PARSERS_H_
+#endif  // NINJA_MANIFEST_PARSER_H_
diff --git a/src/parsers_test.cc b/src/manifest_parser_test.cc
index fc83946..9c6644c 100644
--- a/src/parsers_test.cc
+++ b/src/manifest_parser_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "parsers.h"
+#include "manifest_parser.h"
 
 #include <gtest/gtest.h>
 
diff --git a/src/ninja.cc b/src/ninja.cc
index 6090bdb..809768c 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -42,8 +42,8 @@
 #include "explain.h"
 #include "graph.h"
 #include "graphviz.h"
+#include "manifest_parser.h"
 #include "metrics.h"
-#include "parsers.h"
 #include "state.h"
 #include "util.h"
 
diff --git a/src/test.cc b/src/test.cc
index afedd10..0138b3a 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #include "build_log.h"
-#include "parsers.h"
+#include "manifest_parser.h"
 #include "util.h"
 
 #ifdef _WIN32