Clean up command names, add aliases

22 files changed, 183 insertions, 189 deletions

diff --git a/bpkg/bpkg-options.cli b/bpkg/bpkg-options.cli
index cfdf9d9..8cd4f9c 100644
--- a/bpkg/bpkg-options.cli
+++ b/bpkg/bpkg-options.cli
@@ -39,101 +39,101 @@ namespace bpkg
       ""
     }
 
-    bool build
+    bool cfg-create|create
     {
-      "<pkg>...",
-      "Build one or more packages \- \l{bpkg-build-options(1)}.",
+      "<dir>",
+      "Create configuration.",
       ""
     }
 
-    bool drop
+    bool cfg-add|add
     {
-      "<pkg>...",
-      "Drop one or more packages.",
+      "<rep>",
+      "Add repository to configuration.",
       ""
     }
 
-    bool pkg-verify
+    bool cfg-fetch|fetch
     {
-      "<archive>",
-      "Verify archive is a valid package.",
+      "",
+      "Fetch list of available packages.",
       ""
     }
 
-    bool pkg-status
+    bool pkg-status|status
     {
-      "<pkg>", // [/<ver>]: 24
+      "<pkg>",
       "Print package status.",
       ""
     }
 
-    bool pkg-fetch
+    bool pkg-build|build
     {
-      "<pkg>/<ver>",
-      "Fetch package archive.",
+      "<pkg>",
+      "Build package(s) \- \l{bpkg-pkg-build(1)}.",
       ""
     }
 
-    bool pkg-unpack
+    bool pkg-drop|drop
     {
       "<pkg>",
-      "Unpack package archive.",
+      "Drop package(s).",
       ""
     }
 
-    bool pkg-purge
+    bool pkg-update|update
     {
       "<pkg>",
-      "Purge package.",
+      "Update package.",
       ""
     }
 
-    bool pkg-configure
+    bool pkg-clean|clean
     {
       "<pkg>",
-      "Configure package.",
+      "Clean package.",
       ""
     }
 
-    bool pkg-disfigure
+    bool pkg-verify
     {
-      "<pkg>",
-      "Disfigure package.",
+      "<archive>",
+      "Verify archive is a valid package.",
       ""
     }
 
-    bool pkg-update
+    bool pkg-fetch
     {
-      "<pkg>",
-      "Update package.",
+      "<pkg>/<ver>",
+      "Fetch package archive.",
       ""
     }
 
-    bool pkg-clean
+    bool pkg-unpack
     {
       "<pkg>",
-      "Clean package.",
+      "Unpack package archive.",
       ""
     }
 
-    bool cfg-create
+    bool pkg-configure
     {
-      "[<conf>]",
-      "Create configuration.",
+      "<pkg>",
+      "Configure package.",
       ""
     }
 
-    bool rep-add
+    bool pkg-disfigure
     {
-      "<rep>",
-      "Add repository to configuration.",
+      "<pkg>",
+      "Disfigure package.",
       ""
     }
 
-    bool rep-fetch
+    bool pkg-purge
     {
-      "",
-      "Fetch available packages list.",
+      "<pkg>",
+      "Purge package.",
       ""
     }
 
@@ -147,7 +147,7 @@ namespace bpkg
     bool rep-create
     {
       "[<dir>]",
-      "Create repository manifest file.",
+      "Generate repository packages manifest.",
       ""
     }
   };
@@ -160,7 +160,7 @@ namespace bpkg
 
     bool common-options
     {
-      "Options common for all commands \- \l{bpkg-common-options(1)}."
+      "Details on common options \- \l{bpkg-common-options(1)}."
     }
   };
 
diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index 2f483c3..6b2ef85 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -16,9 +16,8 @@
 //
 #include <bpkg/help>
 
-#include <bpkg/build>
-#include <bpkg/drop>
-
+#include <bpkg/pkg-build>
+#include <bpkg/pkg-drop>
 #include <bpkg/pkg-verify>
 #include <bpkg/pkg-status>
 #include <bpkg/pkg-fetch>
@@ -29,10 +28,10 @@
 #include <bpkg/pkg-update>
 #include <bpkg/pkg-clean>
 
+#include <bpkg/cfg-add>
 #include <bpkg/cfg-create>
+#include <bpkg/cfg-fetch>
 
-#include <bpkg/rep-add>
-#include <bpkg/rep-fetch>
 #include <bpkg/rep-info>
 #include <bpkg/rep-create>
 
@@ -172,17 +171,12 @@ try
       break;                                                            \
     }
 
-    // High-level commands.
-    //
-#define COMMAND(CMD) COMMAND_IMPL(, "", CMD)
-
-    COMMAND(build);
-    COMMAND(drop);
-
     // pkg-* commands
     //
 #define PKG_COMMAND(CMD) COMMAND_IMPL(pkg_, "pkg-", CMD)
 
+    PKG_COMMAND (build);
+    PKG_COMMAND (drop);
     PKG_COMMAND (verify);
     PKG_COMMAND (status);
     PKG_COMMAND (fetch);
@@ -197,14 +191,14 @@ try
     //
 #define CFG_COMMAND(CMD) COMMAND_IMPL(cfg_, "cfg-", CMD)
 
+    CFG_COMMAND (add);
     CFG_COMMAND (create);
+    CFG_COMMAND (fetch);
 
     // rep-* commands
     //
 #define REP_COMMAND(CMD) COMMAND_IMPL(rep_, "rep-", CMD)
 
-    REP_COMMAND (add);
-    REP_COMMAND (fetch);
     REP_COMMAND (info);
     REP_COMMAND (create);
 
diff --git a/bpkg/build b/bpkg/build
deleted file mode 100644
index a5c047d..0000000
--- a/bpkg/build
+++ /dev/null
@@ -1,17 +0,0 @@
-// file      : bpkg/build -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_BUILD
-#define BPKG_BUILD
-
-#include <bpkg/types>
-#include <bpkg/build-options>
-
-namespace bpkg
-{
-  int
-  build (const build_options&, cli::scanner& args);
-}
-
-#endif // BPKG_BUILD
diff --git a/bpkg/buildfile b/bpkg/buildfile
index 2e49f17..580f303 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -10,20 +10,22 @@ import libs += libodb-sqlite%lib{odb-sqlite}
 exe{bpkg}:                                                                   \
 {hxx            }{ bpkg-version     }                                        \
 {            cxx}{ bpkg             } {hxx ixx cxx}{ bpkg-options          } \
-{hxx         cxx}{ build            } {hxx ixx cxx}{ build-options         } \
+{hxx         cxx}{ cfg-add          } {hxx ixx cxx}{ cfg-add-options       } \
 {hxx         cxx}{ cfg-create       } {hxx ixx cxx}{ cfg-create-options    } \
+{hxx         cxx}{ cfg-fetch        } {hxx ixx cxx}{ cfg-fetch-options     } \
                                       {hxx ixx cxx}{ common-options        } \
                                       {hxx ixx cxx}{ configuration-options } \
 {hxx         cxx}{ database         }                                        \
 {hxx         cxx}{ diagnostics      }                                        \
-{hxx         cxx}{ drop             } {hxx ixx cxx}{ drop-options          } \
 {hxx         cxx}{ fetch            }                                        \
 {hxx            }{ forward          }                                        \
 {hxx         cxx}{ help             } {hxx ixx cxx}{ help-options          } \
 {hxx         cxx}{ manifest-utility }                                        \
 {hxx ixx     cxx}{ package          }                                        \
 {hxx ixx     cxx}{ package-odb      }          file{ package.xml           } \
+{hxx         cxx}{ pkg-build        } {hxx ixx cxx}{ pkg-build-options     } \
 {hxx            }{ pkg-clean        } {hxx ixx cxx}{ pkg-clean-options     } \
+{hxx         cxx}{ pkg-drop         } {hxx ixx cxx}{ pkg-drop-options      } \
 {hxx         cxx}{ pkg-command      }                                        \
 {hxx         cxx}{ pkg-configure    } {hxx ixx cxx}{ pkg-configure-options } \
 {hxx         cxx}{ pkg-disfigure    } {hxx ixx cxx}{ pkg-disfigure-options } \
@@ -33,9 +35,7 @@ exe{bpkg}:                                                                   \
 {hxx         cxx}{ pkg-unpack       } {hxx ixx cxx}{ pkg-unpack-options    } \
 {hxx            }{ pkg-update       } {hxx ixx cxx}{ pkg-update-options    } \
 {hxx         cxx}{ pkg-verify       } {hxx ixx cxx}{ pkg-verify-options    } \
-{hxx         cxx}{ rep-add          } {hxx ixx cxx}{ rep-add-options       } \
 {hxx         cxx}{ rep-create       } {hxx ixx cxx}{ rep-create-options    } \
-{hxx         cxx}{ rep-fetch        } {hxx ixx cxx}{ rep-fetch-options     } \
 {hxx         cxx}{ rep-info         } {hxx ixx cxx}{ rep-info-options      } \
 {hxx         cxx}{ satisfaction     }                                        \
 {hxx            }{ types            }                                        \
@@ -62,14 +62,14 @@ if! $cli.loaded
 {hxx ixx cxx}{configuration-options}: cli{configuration-options}
 {hxx ixx cxx}{bpkg-options}:          cli{bpkg-options}
 
-# High-level commands.
+# Help command.
 #
 {hxx ixx cxx}{help-options}:  cli{help-options}
-{hxx ixx cxx}{build-options}: cli{build-options}
-{hxx ixx cxx}{drop-options}:  cli{drop-options}
 
 # pkg-* command.
 #
+{hxx ixx cxx}{pkg-build-options}:     cli{pkg-build-options}
+{hxx ixx cxx}{pkg-drop-options}:      cli{pkg-drop-options}
 {hxx ixx cxx}{pkg-status-options}:    cli{pkg-status-options}
 {hxx ixx cxx}{pkg-fetch-options}:     cli{pkg-fetch-options}
 {hxx ixx cxx}{pkg-unpack-options}:    cli{pkg-unpack-options}
@@ -86,8 +86,8 @@ if! $cli.loaded
 
 # rep-* command.
 #
-{hxx ixx cxx}{rep-add-options}:    cli{rep-add-options}
-{hxx ixx cxx}{rep-fetch-options}:  cli{rep-fetch-options}
+{hxx ixx cxx}{cfg-add-options}:    cli{cfg-add-options}
+{hxx ixx cxx}{cfg-fetch-options}:  cli{cfg-fetch-options}
 {hxx ixx cxx}{rep-info-options}:   cli{rep-info-options}
 {hxx ixx cxx}{rep-create-options}: cli{rep-create-options}
 
@@ -97,7 +97,7 @@ cli.options += -I $src_root --include-with-brackets --include-prefix bpkg \
 --guard-prefix BPKG --cxx-prologue "#include <bpkg/types-parsers>"        \
 --cli-namespace bpkg::cli --generate-file-scanner --generate-specifier    \
 --generate-parse --ansi-color --page-usage 'bpkg::print_$name$_'          \
---include-base-last --long-usage --option-length 20
+--include-base-last --long-usage --option-length 22
 
 cli.cxx{common-options}: cli.options += --short-usage # Both short and long.
 cli.cxx{bpkg-options}: cli.options += --suppress-undocumented # --help, etc.
diff --git a/bpkg/cfg-add b/bpkg/cfg-add
new file mode 100644
index 0000000..9f8ddeb
--- /dev/null
+++ b/bpkg/cfg-add
@@ -0,0 +1,17 @@
+// file      : bpkg/cfg-add -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_CFG_ADD
+#define BPKG_CFG_ADD
+
+#include <bpkg/types>
+#include <bpkg/cfg-add-options>
+
+namespace bpkg
+{
+  int
+  cfg_add (const cfg_add_options&, cli::scanner& args);
+}
+
+#endif // BPKG_CFG_ADD
diff --git a/bpkg/rep-add-options.cli b/bpkg/cfg-add-options.cli
index e9abf51..185fcfd 100644
--- a/bpkg/rep-add-options.cli
+++ b/bpkg/cfg-add-options.cli
@@ -1,30 +1,30 @@
-// file      : bpkg/rep-add-options.cli
+// file      : bpkg/cfg-add-options.cli
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 include <bpkg/configuration-options.cli>;
 
 "\section=1"
-"\name=bpkg-rep-add"
+"\name=bpkg-cfg-add"
 "\summary=add repository to configuration"
 
 /*
 "\h{SYNOPSIS}
 
-bpkg rep-add [<options>] <rep>"
+bpkg cfg-add [<options>] <rep>"
 
 "\h{DESCRIPTION}
 
-The \cb{rep-add} command adds the specified source repository to the
+The \cb{cfg-add} command adds the specified source repository to the
 configuration. Note that this command doesn't fetch the available
 packages list for the newly added repository. To do that, use the
-\cb{rep-fetch} command.
+\cb{cfg-fetch} command.
 "
 */
 
 namespace bpkg
 {
-  class rep_add_options: configuration_options
+  class cfg_add_options: configuration_options
   {
   };
 }
diff --git a/bpkg/rep-add.cxx b/bpkg/cfg-add.cxx
index 0c06ce6..33c4ba5 100644
--- a/bpkg/rep-add.cxx
+++ b/bpkg/cfg-add.cxx
@@ -1,8 +1,8 @@
-// file      : bpkg/rep-add.cxx -*- C++ -*-
+// file      : bpkg/cfg-add.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/rep-add>
+#include <bpkg/cfg-add>
 
 #include <stdexcept> // invalid_argument
 
@@ -20,16 +20,16 @@ using namespace butl;
 namespace bpkg
 {
   int
-  rep_add (const rep_add_options& o, cli::scanner& args)
+  cfg_add (const cfg_add_options& o, cli::scanner& args)
   {
-    tracer trace ("rep_add");
+    tracer trace ("cfg_add");
 
     dir_path c (o.directory ());
     level4 ([&]{trace << "configuration: " << c;});
 
     if (!args.more ())
       fail << "repository location argument expected" <<
-        info << "run 'bpkg help rep-add' for more information";
+        info << "run 'bpkg help cfg-add' for more information";
 
     repository_location rl (parse_location (args.next ()));
     const string& rn (rl.canonical_name ());
diff --git a/bpkg/cfg-fetch b/bpkg/cfg-fetch
new file mode 100644
index 0000000..d311c24
--- /dev/null
+++ b/bpkg/cfg-fetch
@@ -0,0 +1,17 @@
+// file      : bpkg/cfg-fetch -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_CFG_FETCH
+#define BPKG_CFG_FETCH
+
+#include <bpkg/types>
+#include <bpkg/cfg-fetch-options>
+
+namespace bpkg
+{
+  int
+  cfg_fetch (const cfg_fetch_options&, cli::scanner& args);
+}
+
+#endif // BPKG_CFG_FETCH
diff --git a/bpkg/rep-fetch-options.cli b/bpkg/cfg-fetch-options.cli
index 8cb9ddb..696627f 100644
--- a/bpkg/rep-fetch-options.cli
+++ b/bpkg/cfg-fetch-options.cli
@@ -1,28 +1,28 @@
-// file      : bpkg/rep-fetch-options.cli
+// file      : bpkg/cfg-fetch-options.cli
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 include <bpkg/configuration-options.cli>;
 
 "\section=1"
-"\name=bpkg-rep-fetch"
+"\name=bpkg-cfg-fetch"
 "\summary=fetch available packages list"
 
 /*
 "\h{SYNOPSIS}
 
-bpkg rep-fetch [<options>]"
+bpkg cfg-fetch [<options>]"
 
 "\h{DESCRIPTION}
 
-The \cb{rep-fetch} command recursively fetches the prerequisite repository
+The \cb{cfg-fetch} command recursively fetches the prerequisite repository
 and available package lists for all the repositories that were added
-(\cb{rep-add}) to the configuration."
+(\cb{cfg-add}) to the configuration."
 */
 
 namespace bpkg
 {
-  class rep_fetch_options: configuration_options
+  class cfg_fetch_options: configuration_options
   {
   };
 }
diff --git a/bpkg/rep-fetch.cxx b/bpkg/cfg-fetch.cxx
index 1136e98..f765678 100644
--- a/bpkg/rep-fetch.cxx
+++ b/bpkg/cfg-fetch.cxx
@@ -1,8 +1,8 @@
-// file      : bpkg/rep-fetch.cxx -*- C++ -*-
+// file      : bpkg/cfg-fetch.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/rep-fetch>
+#include <bpkg/cfg-fetch>
 
 #include <fstream>
 #include <stdexcept>
@@ -23,11 +23,11 @@ using namespace butl;
 namespace bpkg
 {
   static void
-  rep_fetch (const common_options& co,
+  cfg_fetch (const common_options& co,
              transaction& t,
              const shared_ptr<repository>& r)
   {
-    tracer trace ("rep_fetch(rep)");
+    tracer trace ("cfg_fetch(rep)");
 
     database& db (t.database ());
     tracer_guard tg (db, trace);
@@ -89,7 +89,7 @@ namespace bpkg
       // (or is already being) fetched.
       //
       if (!pr->fetched)
-        rep_fetch (co, t, pr);
+        cfg_fetch (co, t, pr);
 
       // @@ What if we have duplicated? Ideally, we would like to check
       //    this once and as early as possible. The original idea was to
@@ -176,9 +176,9 @@ namespace bpkg
   }
 
   int
-  rep_fetch (const rep_fetch_options& o, cli::scanner&)
+  cfg_fetch (const cfg_fetch_options& o, cli::scanner&)
   {
-    tracer trace ("rep_fetch");
+    tracer trace ("cfg_fetch");
 
     dir_path c (o.directory ());
     level4 ([&]{trace << "configuration: " << c;});
@@ -192,7 +192,7 @@ namespace bpkg
 
     if (ua.empty ())
       fail << "configuration " << c << " has no repositories" <<
-        info << "use 'bpkg rep-add' to add a repository";
+        info << "use 'bpkg cfg-add' to add a repository";
 
     // Clean repositories and available packages. At the end only
     // repositories that were explicitly added by the user and the
@@ -226,7 +226,7 @@ namespace bpkg
     // their packages.
     //
     for (const lazy_shared_ptr<repository>& lp: ua)
-      rep_fetch (o, t, lp.load ());
+      cfg_fetch (o, t, lp.load ());
 
     size_t rcount, pcount;
     if (verb)
diff --git a/bpkg/common-options.cli b/bpkg/common-options.cli
index 02cc605..86955d7 100644
--- a/bpkg/common-options.cli
+++ b/bpkg/common-options.cli
@@ -93,7 +93,7 @@ namespace bpkg
     path --fetch
     {
       "<path>",
-      "The fetch program to be used to download remote resources. Currently,
+      "The fetch program to be used to download resources. Currently,
        \cb{bpkg} recognizes \cb{curl}, \cb{wget}, and \cb{fetch}. Note that
        the last component of <path> must contain one of these names as a
        substring in order for \cb{bpkg} to recognize which program is being
diff --git a/bpkg/drop b/bpkg/drop
deleted file mode 100644
index 0054045..0000000
--- a/bpkg/drop
+++ /dev/null
@@ -1,17 +0,0 @@
-// file      : bpkg/drop -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_DROP
-#define BPKG_DROP
-
-#include <bpkg/types>
-#include <bpkg/drop-options>
-
-namespace bpkg
-{
-  int
-  drop (const drop_options&, cli::scanner& args);
-}
-
-#endif // BPKG_DROP
diff --git a/bpkg/package b/bpkg/package
index 4269605..f07a2c1 100644
--- a/bpkg/package
+++ b/bpkg/package
@@ -370,7 +370,7 @@ namespace bpkg
 
     // Repository from which this package came. Note that it is not
     // a pointer to the repository object because it could be wiped
-    // out (e.g., as a result of rep-fetch). We call such packages
+    // out (e.g., as a result of cfg-fetch). We call such packages
     // "orphans". While we can get a list of orphan's prerequisites
     // (by loading its manifest), we wouldn't know which repository
     // to use as a base to resolve them. As a result, an orphan that
diff --git a/bpkg/pkg-build b/bpkg/pkg-build
new file mode 100644
index 0000000..562321f
--- /dev/null
+++ b/bpkg/pkg-build
@@ -0,0 +1,17 @@
+// file      : bpkg/pkg-build -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_PKG_BUILD
+#define BPKG_PKG_BUILD
+
+#include <bpkg/types>
+#include <bpkg/pkg-build-options>
+
+namespace bpkg
+{
+  int
+  pkg_build (const pkg_build_options&, cli::scanner& args);
+}
+
+#endif // BPKG_PKG_BUILD
diff --git a/bpkg/build-options.cli b/bpkg/pkg-build-options.cli
index 77cfd72..ceeef65 100644
--- a/bpkg/build-options.cli
+++ b/bpkg/pkg-build-options.cli
@@ -1,11 +1,11 @@
-// file      : bpkg/build-options.cli
+// file      : bpkg/pkg-build-options.cli
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 include <bpkg/configuration-options.cli>;
 
 "\section=1"
-"\name=bpkg-build"
+"\name=bpkg-pkg-build"
 "\summary=build one or more packages"
 
 namespace bpkg
@@ -15,15 +15,15 @@ namespace bpkg
 
     "\h|SYNOPSIS|
 
-     \c{\b{bpkg build} [<options>] (<pkg>[/<ver>] | <file> | <dir>)...}
+     \c{\b{bpkg pkg-build} [<options>] (<pkg>[/<ver>] | <file> | <dir>)...}
 
      \h|DESCRIPTION|
 
-     The \cb{build} command builds one or more packages including all their
+     The \cb{pkg-build} command builds one or more packages including all their
      prerequisites. Each package can be specified as just the name (<pkg>) with
      optional package version (<ver>) in which case the package will be
      automatically fetched from one of the configuration's source repositories
-     (see the \cb{rep-add} and \cb{rep-fetch} commands). Alternatively, the
+     (see the \cb{cfg-add} and \cb{cfg-fetch} commands). Alternatively, the
      package can be specified as either the path to the package source archive
      (<file>) or package source directory (<dir>). See the \cb{pkg-fetch} and
      \cb{pkg-unpack} commands for more information on the semantics of
@@ -36,13 +36,13 @@ namespace bpkg
      addition, have their versions held, that is, they will not be
      automatically upgraded.
 
-     The \cb{build} command also supports several \cb{--*-only} options that
-     allow you to limit the amount of work that will be done."
+     The \cb{pkg-build} command also supports several \cb{--*-only} options
+     that allow you to limit the amount of work that will be done."
   }
 
-  class build_options: configuration_options
+  class pkg_build_options: configuration_options
   {
-    "\h|BUILD OPTIONS|"
+    "\h|PKG-BUILD OPTIONS|"
 
     bool --yes|-y
     {
diff --git a/bpkg/build.cxx b/bpkg/pkg-build.cxx
index 3cb96f4..cb108eb 100644
--- a/bpkg/build.cxx
+++ b/bpkg/pkg-build.cxx
@@ -1,8 +1,8 @@
-// file      : bpkg/build.cxx -*- C++ -*-
+// file      : bpkg/pkg-build.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/build>
+#include <bpkg/pkg-build>
 
 #include <map>
 #include <list>
@@ -717,16 +717,16 @@ namespace bpkg
   };
 
   int
-  build (const build_options& o, cli::scanner& args)
+  pkg_build (const pkg_build_options& o, cli::scanner& args)
   {
-    tracer trace ("build");
+    tracer trace ("pkg_build");
 
     const dir_path& c (o.directory ());
     level4 ([&]{trace << "configuration: " << c;});
 
     if (!args.more ())
       fail << "package name argument expected" <<
-        info << "run 'bpkg help build' for more information";
+        info << "run 'bpkg help pkg-build' for more information";
 
     database db (open (c, trace));
 
@@ -908,10 +908,10 @@ namespace bpkg
           //
           if (db.query_value<repository_count> () == 0)
             dr << info << "configuration " << c << " has no repositories"
-               << info << "use 'bpkg rep-add' to add a repository";
+               << info << "use 'bpkg cfg-add' to add a repository";
           else if (db.query_value<available_package_count> () == 0)
             dr << info << "configuration " << c << " has no available packages"
-               << info << "use 'bpkg rep-fetch' to fetch available packages "
+               << info << "use 'bpkg cfg-fetch' to fetch available packages "
                << "list";
         }
 
diff --git a/bpkg/pkg-drop b/bpkg/pkg-drop
new file mode 100644
index 0000000..cb70ed0
--- /dev/null
+++ b/bpkg/pkg-drop
@@ -0,0 +1,17 @@
+// file      : bpkg/pkg-drop -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_PKG_DROP
+#define BPKG_PKG_DROP
+
+#include <bpkg/types>
+#include <bpkg/pkg-drop-options>
+
+namespace bpkg
+{
+  int
+  pkg_drop (const pkg_drop_options&, cli::scanner& args);
+}
+
+#endif // BPKG_PKG_DROP
diff --git a/bpkg/drop-options.cli b/bpkg/pkg-drop-options.cli
index 6901398..6409ee8 100644
--- a/bpkg/drop-options.cli
+++ b/bpkg/pkg-drop-options.cli
@@ -1,33 +1,33 @@
-// file      : bpkg/drop-options.cli
+// file      : bpkg/pkg-drop-options.cli
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 include <bpkg/configuration-options.cli>;
 
 "\section=1"
-"\name=bpkg-drop"
+"\name=bpkg-pkg-drop"
 "\summary=drop one or more packages"
 
 /*
 "\h{SYNOPSIS}
 
-bpkg drop [<options>] <pkg>..."
+bpkg pkg-drop [<options>] <pkg>..."
 
 "\h{DESCRIPTION}
 
-The \cb{drop} command drops one or more packages from the configuration.
+The \cb{pkg-drop} command drops one or more packages from the configuration.
 If the packages being dropped still have dependents, then those will have
 to be drop as well and you will be prompted for a confirmation. Similarly,
 if the packages being dropped have prerequisites that are no longer needed,
 you will be offered to drop those as well.
 
-The \cb{drop} command also supports several \cb{--*-only} options that allow
-you to limit the amount of work that will be done.
+The \cb{pkg-drop} command also supports several \cb{--*-only} options that
+allow you to limit the amount of work that will be done.
 */
 
 namespace bpkg
 {
-  class drop_options: configuration_options
+  class pkg_drop_options: configuration_options
   {
     bool --yes|-y
     {
diff --git a/bpkg/drop.cxx b/bpkg/pkg-drop.cxx
index 87c475d..f7d897d 100644
--- a/bpkg/drop.cxx
+++ b/bpkg/pkg-drop.cxx
@@ -1,8 +1,8 @@
-// file      : bpkg/drop.cxx -*- C++ -*-
+// file      : bpkg/pkg-drop.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/drop>
+#include <bpkg/pkg-drop>
 
 #include <map>
 #include <list>
@@ -293,9 +293,9 @@ namespace bpkg
   };
 
   int
-  drop (const drop_options& o, cli::scanner& args)
+  pkg_drop (const pkg_drop_options& o, cli::scanner& args)
   {
-    tracer trace ("drop");
+    tracer trace ("pkg_drop");
 
     if (o.yes () && o.no ())
       fail << "both --yes|-y and --no|-n specified";
@@ -305,7 +305,7 @@ namespace bpkg
 
     if (!args.more ())
       fail << "package name argument expected" <<
-        info << "run 'bpkg help drop' for more information";
+        info << "run 'bpkg help pkg-drop' for more information";
 
     database db (open (c, trace));
 
diff --git a/bpkg/pkg-fetch.cxx b/bpkg/pkg-fetch.cxx
index 1718c5b..8926a9d 100644
--- a/bpkg/pkg-fetch.cxx
+++ b/bpkg/pkg-fetch.cxx
@@ -180,11 +180,11 @@ namespace bpkg
 
     if (db.query_value<repository_count> () == 0)
       fail << "configuration " << c << " has no repositories" <<
-        info << "use 'bpkg rep-add' to add a repository";
+        info << "use 'bpkg cfg-add' to add a repository";
 
     if (db.query_value<available_package_count> () == 0)
       fail << "configuration " << c << " has no available packages" <<
-        info << "use 'bpkg rep-fetch' to fetch available packages list";
+        info << "use 'bpkg cfg-fetch' to fetch available packages list";
 
     shared_ptr<available_package> ap (
       db.find<available_package> (available_package_id (n, v)));
diff --git a/bpkg/rep-add b/bpkg/rep-add
deleted file mode 100644
index 10d85f4..0000000
--- a/bpkg/rep-add
+++ /dev/null
@@ -1,17 +0,0 @@
-// file      : bpkg/rep-add -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_REP_ADD
-#define BPKG_REP_ADD
-
-#include <bpkg/types>
-#include <bpkg/rep-add-options>
-
-namespace bpkg
-{
-  int
-  rep_add (const rep_add_options&, cli::scanner& args);
-}
-
-#endif // BPKG_REP_ADD
diff --git a/bpkg/rep-fetch b/bpkg/rep-fetch
deleted file mode 100644
index 9175755..0000000
--- a/bpkg/rep-fetch
+++ /dev/null
@@ -1,17 +0,0 @@
-// file      : bpkg/rep-fetch -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_REP_FETCH
-#define BPKG_REP_FETCH
-
-#include <bpkg/types>
-#include <bpkg/rep-fetch-options>
-
-namespace bpkg
-{
-  int
-  rep_fetch (const rep_fetch_options&, cli::scanner& args);
-}
-
-#endif // BPKG_REP_FETCH