5 files changed, 15 insertions, 15 deletions
diff --git a/libbuild2/rule-adhoc-buildscript.cxx b/libbuild2/adhoc-rule-buildscript.cxx
index a4d7408..c68f4b2 100644
--- a/libbuild2/rule-adhoc-buildscript.cxx
+++ b/libbuild2/adhoc-rule-buildscript.cxx
@@ -1,7 +1,7 @@
-// file      : libbuild2/rule-adhoc-buildscript.cxx -*- C++ -*-
+// file      : libbuild2/adhoc-rule-buildscript.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <libbuild2/rule-adhoc-buildscript.hxx>
+#include <libbuild2/adhoc-rule-buildscript.hxx>
 
 #include <sstream>
 
diff --git a/libbuild2/rule-adhoc-buildscript.hxx b/libbuild2/adhoc-rule-buildscript.hxx
index 5f10ef4..b863d77 100644
--- a/libbuild2/rule-adhoc-buildscript.hxx
+++ b/libbuild2/adhoc-rule-buildscript.hxx
@@ -1,8 +1,8 @@
-// file      : libbuild2/rule-adhoc-buildscript.hxx -*- C++ -*-
+// file      : libbuild2/adhoc-rule-buildscript.hxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef LIBBUILD2_RULE_ADHOC_BUILDSCRIPT_HXX
-#define LIBBUILD2_RULE_ADHOC_BUILDSCRIPT_HXX
+#ifndef LIBBUILD2_ADHOC_RULE_BUILDSCRIPT_HXX
+#define LIBBUILD2_ADHOC_RULE_BUILDSCRIPT_HXX
 
 #include <libbuild2/types.hxx>
 #include <libbuild2/forward.hxx>
@@ -53,4 +53,4 @@ namespace build2
   };
 }
 
-#endif // LIBBUILD2_RULE_ADHOC_BUILDSCRIPT_HXX
+#endif // LIBBUILD2_ADHOC_RULE_BUILDSCRIPT_HXX
diff --git a/libbuild2/rule-adhoc-cxx.cxx b/libbuild2/adhoc-rule-cxx.cxx
index 1159a17..8d9b788 100644
--- a/libbuild2/rule-adhoc-cxx.cxx
+++ b/libbuild2/adhoc-rule-cxx.cxx
@@ -1,7 +1,7 @@
-// file      : libbuild2/rule-adhoc-cxx.cxx -*- C++ -*-
+// file      : libbuild2/adhoc-rule-cxx.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <libbuild2/rule-adhoc-cxx.hxx>
+#include <libbuild2/adhoc-rule-cxx.hxx>
 
 #include <libbutl/filesystem.mxx> // file_time()
 
@@ -372,7 +372,7 @@ namespace build2
             << "#include <libbuild2/algorithm.hxx>"                     << '\n'
             << "#include <libbuild2/filesystem.hxx>"                    << '\n'
             << "#include <libbuild2/diagnostics.hxx>"                   << '\n'
-            << "#include <libbuild2/rule-adhoc-cxx.hxx>"                << '\n'
+            << "#include <libbuild2/adhoc-rule-cxx.hxx>"                << '\n'
             << '\n';
 
         // Write the global fragment, if any. Note that it always includes the
diff --git a/libbuild2/rule-adhoc-cxx.hxx b/libbuild2/adhoc-rule-cxx.hxx
index 00ed279..9b94783 100644
--- a/libbuild2/rule-adhoc-cxx.hxx
+++ b/libbuild2/adhoc-rule-cxx.hxx
@@ -1,8 +1,8 @@
-// file      : libbuild2/rule-adhoc-cxx.hxx -*- C++ -*-
+// file      : libbuild2/adhoc-rule-cxx.hxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef LIBBUILD2_RULE_ADHOC_CXX_HXX
-#define LIBBUILD2_RULE_ADHOC_CXX_HXX
+#ifndef LIBBUILD2_ADHOC_RULE_CXX_HXX
+#define LIBBUILD2_ADHOC_RULE_CXX_HXX
 
 #include <libbuild2/types.hxx>
 #include <libbuild2/forward.hxx>
@@ -80,4 +80,4 @@ namespace build2
   };
 }
 
-#endif // LIBBUILD2_RULE_ADHOC_CXX_HXX
+#endif // LIBBUILD2_ADHOC_RULE_CXX_HXX
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx
index bdac7cb..2255947 100644
--- a/libbuild2/parser.cxx
+++ b/libbuild2/parser.cxx
@@ -20,8 +20,8 @@
 #include <libbuild2/diagnostics.hxx>
 #include <libbuild2/prerequisite.hxx>
 
-#include <libbuild2/rule-adhoc-cxx.hxx>
-#include <libbuild2/rule-adhoc-buildscript.hxx>
+#include <libbuild2/adhoc-rule-cxx.hxx>
+#include <libbuild2/adhoc-rule-buildscript.hxx>
 
 #include <libbuild2/config/utility.hxx> // lookup_config