diff --git a/src/app/config/config.c b/src/app/config/config.c
index f2db0e5250..27b12f562f 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -61,7 +61,7 @@
 #define CONFIG_PRIVATE
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/config/statefile.h"
 #include "app/main/main.h"
 #include "app/main/subsysmgr.h"
diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c
index 834ad93ed7..1d6f63cdeb 100644
--- a/src/app/config/statefile.c
+++ b/src/app/config/statefile.c
@@ -12,7 +12,7 @@
  *
  * This 'state' file is a typed key-value store that allows multiple
  * entries for the same key.  It follows the same metaformat as described
- * in confparse.c, and uses the same code to read and write itself.
+ * in confmgt.c, and uses the same code to read and write itself.
  *
  * The state file is most suitable for small values that don't change too
  * frequently.  For values that become very large, we typically use a separate
@@ -32,7 +32,7 @@
 #include "core/or/or.h"
 #include "core/or/circuitstats.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/mainloop.h"
 #include "core/mainloop/netstatus.h"
 #include "core/mainloop/connection.h"
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 1daf468715..57d929292d 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -30,7 +30,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/crypto/hs_ntor.h"
 #include "core/crypto/onion_crypto.h"
 #include "core/crypto/onion_fast.h"
diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c
index 7a7f3ca600..7df2154116 100644
--- a/src/core/or/circuitstats.c
+++ b/src/core/or/circuitstats.c
@@ -29,7 +29,7 @@
 #include "core/or/circuitbuild.h"
 #include "core/or/circuitstats.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "feature/control/control_events.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "core/mainloop/mainloop.h"
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 4e61899ecd..8af8f14bb0 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -114,7 +114,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/config/statefile.h"
 #include "core/mainloop/connection.h"
 #include "core/mainloop/mainloop.h"
diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
index 68179beef0..e1a8292c9f 100644
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -13,7 +13,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/main/main.h"
 #include "core/mainloop/connection.h"
 #include "core/or/circuitbuild.h"
@@ -590,7 +590,7 @@ control_setconf_helper(control_connection_t *conn,
   const unsigned flags =
     CAL_CLEAR_FIRST | (use_defaults ? CAL_USE_DEFAULTS : 0);
 
-  // We need a copy here, since confparse.c wants to canonicalize cases.
+  // We need a copy here, since confmgt.c wants to canonicalize cases.
   config_line_t *lines = config_lines_dup(args->kwargs);
 
   opt_err = options_trial_assign(lines, flags, &errstring);
diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c
index 2b9dc0c383..ebc595e517 100644
--- a/src/feature/dirauth/shared_random.c
+++ b/src/feature/dirauth/shared_random.c
@@ -90,7 +90,7 @@
 #include "core/or/or.h"
 #include "feature/dirauth/shared_random.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/nodelist/networkstatus.h"
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index e548eb4028..759b3b8104 100644
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -12,7 +12,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/dirauth/dirvote.h"
 #include "feature/nodelist/networkstatus.h"
diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c
index 9a205d39b7..4f2406d10f 100644
--- a/src/feature/nodelist/routerset.c
+++ b/src/feature/nodelist/routerset.c
@@ -17,7 +17,7 @@
  *
  * Routersets are typically used for user-specified restrictions, and
  * are created by invoking routerset_new and routerset_parse from
- * config.c and confparse.c.  To use a routerset, invoke one of
+ * config.c and confmgt.c.  To use a routerset, invoke one of
  * routerset_contains_...() functions , or use
  * routerstatus_get_all_nodes() / routerstatus_subtract_nodes() to
  * manipulate a smartlist of node_t pointers.
diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h
index dbfd564079..7e12fe76db 100644
--- a/src/lib/conf/conftesting.h
+++ b/src/lib/conf/conftesting.h
@@ -17,7 +17,7 @@
 #define USE_CONF_TESTING
 /**
  * Union used when building in test mode typechecking the members of a type
- * used with confparse.c.  See CONF_CHECK_VAR_TYPE for a description of how
+ * used with confmgt.c.  See CONF_CHECK_VAR_TYPE for a description of how
  * it is used. */
 typedef union {
   char **STRING;
@@ -47,7 +47,7 @@ typedef union {
 /* Macros to define extra members inside config_var_t fields, and at the
  * end of a list of them.
  */
-/* This is a somewhat magic type-checking macro for users of confparse.c.
+/* This is a somewhat magic type-checking macro for users of confmgt.c.
  * It initializes a union member "confparse_dummy_values_t.conftype" with
  * the address of a static member "tp_dummy.member".   This
  * will give a compiler warning unless the member field is of the correct
diff --git a/src/lib/confmgt/confmgt.c b/src/lib/confmgt/confmgt.c
index ccef40bd2e..1218a63ae3 100644
--- a/src/lib/confmgt/confmgt.c
+++ b/src/lib/confmgt/confmgt.c
@@ -21,9 +21,9 @@
  * specified, and a linked list of key-value pairs.
  */
 
-#define CONFPARSE_PRIVATE
+#define CONFMGT_PRIVATE
 #include "orconfig.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 
 #include "lib/confmgt/structvar.h"
 #include "lib/confmgt/unitparse.h"
diff --git a/src/lib/confmgt/confmgt.h b/src/lib/confmgt/confmgt.h
index 246ad887cb..f565742c55 100644
--- a/src/lib/confmgt/confmgt.h
+++ b/src/lib/confmgt/confmgt.h
@@ -5,13 +5,13 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file confparse.h
+ * \file confmgt.h
  *
- * \brief Header for confparse.c.
+ * \brief Header for confmgt.c.
  */
 
-#ifndef TOR_CONFPARSE_H
-#define TOR_CONFPARSE_H
+#ifndef TOR_CONFMGT_H
+#define TOR_CONFMGT_H
 
 #include "lib/conf/conftypes.h"
 #include "lib/conf/confmacros.h"
@@ -123,13 +123,13 @@ bool config_var_is_listable(const config_var_t *var);
 #define CFG_EQ_LINELIST(a,b,opt) config_lines_eq((a)->opt, (b)->opt)
 #define CFG_EQ_ROUTERSET(a,b,opt) routerset_equal((a)->opt, (b)->opt)
 
-#ifdef CONFPARSE_PRIVATE
+#ifdef CONFMGT_PRIVATE
 STATIC void config_reset_line(const config_mgr_t *mgr, void *options,
                               const char *key, int use_defaults);
 STATIC void *config_mgr_get_obj_mutable(const config_mgr_t *mgr,
                                         void *toplevel, int idx);
 STATIC const void *config_mgr_get_obj(const config_mgr_t *mgr,
                                        const void *toplevel, int idx);
-#endif /* defined(CONFPARSE_PRIVATE) */
+#endif /* defined(CONFMGT_PRIVATE) */
 
-#endif /* !defined(TOR_CONFPARSE_H) */
+#endif /* !defined(TOR_CONFMGT_H) */
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 7e0802b810..83f3c50ca9 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -16,7 +16,7 @@
 #include "core/or/circuitmux_ewma.h"
 #include "core/or/circuitbuild.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "test/test.h"
diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c
index bcacfe953d..375a513c07 100644
--- a/src/test/test_confmgr.c
+++ b/src/test/test_confmgr.c
@@ -4,16 +4,16 @@
 /* See LICENSE for licensing information */
 
 /*
- * Tests for confparse.c's features that support multiple configuration
+ * Tests for confmgt.c's features that support multiple configuration
  * formats and configuration objects.
  */
 
-#define CONFPARSE_PRIVATE
+#define CONFMGT_PRIVATE
 #include "orconfig.h"
 
 #include "core/or/or.h"
 #include "lib/encoding/confline.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c
index 0c12e35f8a..39e2de866c 100644
--- a/src/test/test_confparse.c
+++ b/src/test/test_confparse.c
@@ -4,17 +4,17 @@
 /* See LICENSE for licensing information */
 
 /*
- * Tests for confparse.c module that we use to parse various
+ * Tests for confmgt.c module that we use to parse various
  * configuration/state file types.
  */
 
-#define CONFPARSE_PRIVATE
+#define CONFMGT_PRIVATE
 #include "orconfig.h"
 
 #include "core/or/or.h"
 #include "lib/encoding/confline.h"
 #include "feature/nodelist/routerset.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 23fad2e59f..02465b07f0 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -26,7 +26,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/connection.h"
 #include "core/or/relay.h"
 #include "core/or/versions.h"
diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c
index 8f2d507743..c64c1e814a 100644
--- a/src/test/test_entryconn.c
+++ b/src/test/test_entryconn.c
@@ -11,7 +11,7 @@
 
 #include "feature/client/addressmap.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "feature/nodelist/nodelist.h"
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index dec7874c7d..ca699b3cf1 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -18,7 +18,7 @@
 #include "core/or/circuitlist.h"
 #include "core/or/circuitbuild.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "feature/dircommon/directory.h"
 #include "feature/dirclient/dirclient.h"
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 8eb3c2c928..29743a0d15 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -16,7 +16,7 @@
 
 #include "lib/buf/buffers.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/main/subsysmgr.h"
 #include "core/mainloop/connection.h"
 #include "lib/crypt_ops/crypto_rand.h"
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 268ed57531..ae26cf31b9 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -6,7 +6,7 @@
 #define CONFIG_PRIVATE
 #define LOG_PRIVATE
 #include "core/or/or.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/config/config.h"
 #include "test/test.h"
 #include "lib/geoip/geoip.h"
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 8f3ce03c42..0e391c1baa 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -11,7 +11,7 @@
 #define PROCESS_PRIVATE
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "feature/control/control.h"
 #include "feature/control/control_events.h"
 #include "feature/client/transports.h"