20 files changed, 13 insertions, 13 deletions
diff --git a/load/load.cxx b/load/load.cxx
index 44cfe0e..85fb3ee 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -49,8 +49,8 @@ struct failed {};
 static const char* help_info (
   "  info: run 'brep-load --help' for more information");
 
-static const path packages     ("packages");
-static const path repositories ("repositories");
+static const path packages     ("packages.manifest");
+static const path repositories ("repositories.manifest");
 
 struct internal_repository
 {
@@ -183,10 +183,10 @@ load_repositories (path p)
           }
 
           if (!file_exists (r.packages_path ()))
-            bad_line ("'packages' file does not exist");
+            bad_line ("packages.manifest file does not exist");
 
           if (!file_exists (r.repositories_path ()))
-            bad_line ("'repositories' file does not exist");
+            bad_line ("repositories.manifest file does not exist");
         }
         else if (strncmp (nv.c_str (), "fingerprint:", vp = 12) == 0)
         {
@@ -302,8 +302,8 @@ repository_info (const options& lo, const string& rl, const cstrings& options)
   }
 }
 
-// Load the repository packages from the 'packages' file and persist the
-// repository. Should be called once per repository.
+// Load the repository packages from the packages.manifest file and persist
+// the repository. Should be called once per repository.
 //
 static void
 load_packages (const shared_ptr<repository>& rp, database& db)
@@ -341,7 +341,7 @@ load_packages (const shared_ptr<repository>& rp, database& db)
       db.find<package> (package_id (pm.name, pm.version)));
 
     // sha256sum should always be present if the package manifest comes from
-    // the 'packages' file.
+    // the packages.manifest file.
     //
     assert (pm.sha256sum);
 
@@ -456,7 +456,7 @@ load_packages (const shared_ptr<repository>& rp, database& db)
 }
 
 // Load the repository manifest values, prerequsite repositories, and their
-// complements state from the 'repositories' file. Update the repository
+// complements state from the repositories.manifest file. Update the repository
 // persistent state to save changed members. Should be called once per
 // persisted internal repository.
 //
diff --git a/tests/load/1/basics/packages b/tests/load/1/basics/packages.manifest
index d422df5..d422df5 100644
--- a/tests/load/1/basics/packages
+++ b/tests/load/1/basics/packages.manifest
diff --git a/tests/load/1/basics/repositories b/tests/load/1/basics/repositories.manifest
index 57a1c7a..57a1c7a 100644
--- a/tests/load/1/basics/repositories
+++ b/tests/load/1/basics/repositories.manifest
diff --git a/tests/load/1/math/packages b/tests/load/1/math/packages.manifest
index b538d9e..b538d9e 100644
--- a/tests/load/1/math/packages
+++ b/tests/load/1/math/packages.manifest
diff --git a/tests/load/1/math/repositories b/tests/load/1/math/repositories.manifest
index 6c63820..6c63820 100644
--- a/tests/load/1/math/repositories
+++ b/tests/load/1/math/repositories.manifest
diff --git a/tests/load/1/misc/packages b/tests/load/1/misc/packages.manifest
index f4f7f59..f4f7f59 100644
--- a/tests/load/1/misc/packages
+++ b/tests/load/1/misc/packages.manifest
diff --git a/tests/load/1/misc/repositories b/tests/load/1/misc/repositories.manifest
index 1a41290..1a41290 100644
--- a/tests/load/1/misc/repositories
+++ b/tests/load/1/misc/repositories.manifest
diff --git a/tests/load/1/stable/packages b/tests/load/1/stable/packages.manifest
index dd44465..dd44465 100644
--- a/tests/load/1/stable/packages
+++ b/tests/load/1/stable/packages.manifest
diff --git a/tests/load/1/stable/repositories b/tests/load/1/stable/repositories.manifest
index ffe08ef..ffe08ef 100644
--- a/tests/load/1/stable/repositories
+++ b/tests/load/1/stable/repositories.manifest
diff --git a/tests/load/1/stable/signature b/tests/load/1/stable/signature.manifest
index 5ffaac5..5ffaac5 100644
--- a/tests/load/1/stable/signature
+++ b/tests/load/1/stable/signature.manifest
diff --git a/tests/load/1/staging/packages b/tests/load/1/staging/packages.manifest
index 97c252a..97c252a 100644
--- a/tests/load/1/staging/packages
+++ b/tests/load/1/staging/packages.manifest
diff --git a/tests/load/1/staging/repositories b/tests/load/1/staging/repositories.manifest
index d72a3f8..d72a3f8 100644
--- a/tests/load/1/staging/repositories
+++ b/tests/load/1/staging/repositories.manifest
diff --git a/tests/load/1/testing/packages b/tests/load/1/testing/packages.manifest
index a903878..a903878 100644
--- a/tests/load/1/testing/packages
+++ b/tests/load/1/testing/packages.manifest
diff --git a/tests/load/1/testing/repositories b/tests/load/1/testing/repositories.manifest
index a218d5c..a218d5c 100644
--- a/tests/load/1/testing/repositories
+++ b/tests/load/1/testing/repositories.manifest
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index f16c484..61c10b0 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -27,8 +27,8 @@ using namespace odb::core;
 using namespace butl;
 using namespace brep;
 
-static const path packages     ("packages");
-static const path repositories ("repositories");
+static const path packages     ("packages.manifest");
+static const path repositories ("repositories.manifest");
 
 static bool
 check_location (shared_ptr<package>& p)
@@ -114,10 +114,10 @@ main (int argc, char* argv[])
     if (cp.relative ())
       cp.complete ();
 
-    // Update packages file timestamp to enforce loader to update
-    // persistent state.
+    // Update the packages.manifest file timestamp to enforce the loader to
+    // update the persistent state.
     //
-    path p (cp.directory () / path ("1/stable/packages"));
+    path p (cp.directory () / dir_path ("1/stable") / packages);
     char const* args[] = {"touch", p.string ().c_str (), nullptr};
     assert (process (args).wait ());
 
diff --git a/tests/load/pkg/1/dev.cppget.org/signed/packages b/tests/load/pkg/1/dev.cppget.org/signed/packages.manifest
index 584c490..584c490 100644
--- a/tests/load/pkg/1/dev.cppget.org/signed/packages
+++ b/tests/load/pkg/1/dev.cppget.org/signed/packages.manifest
diff --git a/tests/load/pkg/1/dev.cppget.org/signed/repositories b/tests/load/pkg/1/dev.cppget.org/signed/repositories.manifest
index ecd89f7..ecd89f7 100644
--- a/tests/load/pkg/1/dev.cppget.org/signed/repositories
+++ b/tests/load/pkg/1/dev.cppget.org/signed/repositories.manifest
diff --git a/tests/load/pkg/1/dev.cppget.org/signed/signature b/tests/load/pkg/1/dev.cppget.org/signed/signature.manifest
index 46cea28..46cea28 100644
--- a/tests/load/pkg/1/dev.cppget.org/signed/signature
+++ b/tests/load/pkg/1/dev.cppget.org/signed/signature.manifest
diff --git a/tests/load/pkg/1/dev.cppget.org/unsigned/packages b/tests/load/pkg/1/dev.cppget.org/unsigned/packages.manifest
index 0de6976..0de6976 100644
--- a/tests/load/pkg/1/dev.cppget.org/unsigned/packages
+++ b/tests/load/pkg/1/dev.cppget.org/unsigned/packages.manifest
diff --git a/tests/load/pkg/1/dev.cppget.org/unsigned/repositories b/tests/load/pkg/1/dev.cppget.org/unsigned/repositories.manifest
index 9a15f2b..9a15f2b 100644
--- a/tests/load/pkg/1/dev.cppget.org/unsigned/repositories
+++ b/tests/load/pkg/1/dev.cppget.org/unsigned/repositories.manifest