c* -> ceph-*

Hopefully I didn't miss too much...

Signed-off-by: Sage Weil <sage@newdream.net>

49 files changed, 209 insertions, 209 deletions

diff --git a/src/.gitignore b/src/.gitignore
index e60302a656f..872cc4394e5 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,9 +1,9 @@
-/cfuse
-/cmds
-/cmon
+/ceph-fuse
+/ceph-mds
+/ceph-mon
 /ceph
-/cosd
-/csyn
+/ceph-osd
+/ceph-syn
 /dupstore
 /fakefuse
 /fakesyn
@@ -11,7 +11,7 @@
 /monmaptool
 /newsyn
 /authtool
-/cauthtool
+/ceph-authtool
 /crushtool
 /mkcephfs
 /mount.ceph
@@ -64,8 +64,8 @@ CrushWrapper.pm
 crush/CrushWrapper_wrap.cxx
 
 /.git_version
-/cconf
-/cdebugpack
+/ceph-conf
+/ceph-debugpack
 /cephfs
 /ceph-coverage
 /dumpjournal
diff --git a/src/Makefile.am b/src/Makefile.am
index 63d849b9e0d..ef5e17a66f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS =
 bin_DEBUGPROGRAMS =
 sbin_PROGRAMS =
 sbin_SCRIPTS =
-bin_SCRIPTS = crun $(srcdir)/cclsinfo cdebugpack crbdnamer
+bin_SCRIPTS = ceph-run $(srcdir)/ceph-clsinfo ceph-debugpack ceph-rbdnamer
 dist_bin_SCRIPTS =
 # C/C++ tests to build will be appended to this
 check_PROGRAMS =
@@ -25,24 +25,24 @@ endif
 LIBGLOBAL_LDA = libglobal.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 
 # monitor
-cmon_SOURCES = cmon.cc
-cmon_LDFLAGS = $(AM_LDFLAGS)
-cmon_LDADD = libmon.la $(LIBGLOBAL_LDA)
-cmon_CXXFLAGS = ${AM_CXXFLAGS}
-bin_PROGRAMS += cmon
+ceph_mon_SOURCES = cmon.cc
+ceph_mon_LDFLAGS = $(AM_LDFLAGS)
+ceph_mon_LDADD = libmon.la $(LIBGLOBAL_LDA)
+ceph_mon_CXXFLAGS = ${AM_CXXFLAGS}
+bin_PROGRAMS += ceph-mon
 
 # osd
-cosd_SOURCES = cosd.cc objclass/class_debug.cc \
+ceph_osd_SOURCES = cosd.cc objclass/class_debug.cc \
 	       objclass/class_api.cc
-cosd_LDADD = libosd.la libos.la $(LIBGLOBAL_LDA) -ldl
-bin_PROGRAMS += cosd
-cosd_CXXFLAGS = ${AM_CXXFLAGS}
+ceph_osd_LDADD = libosd.la libos.la $(LIBGLOBAL_LDA) -ldl
+bin_PROGRAMS += ceph-osd
+ceph_osd_CXXFLAGS = ${AM_CXXFLAGS}
 
 # mds
-cmds_SOURCES = cmds.cc
-cmds_LDADD = libmds.a libosdc.la $(LIBGLOBAL_LDA)
-bin_PROGRAMS += cmds
-cmds_CXXFLAGS = ${AM_CXXFLAGS}
+ceph_mds_SOURCES = cmds.cc
+ceph_mds_LDADD = libmds.a libosdc.la $(LIBGLOBAL_LDA)
+bin_PROGRAMS += ceph-mds
+ceph_mds_CXXFLAGS = ${AM_CXXFLAGS}
 
 # admin tools
 ceph_SOURCES = \
@@ -83,11 +83,11 @@ gceph_CXXFLAGS = ${AM_CXXFLAGS} $(GTKMM_CFLAGS) \
 bin_PROGRAMS += gceph
 endif
 
-cconf_SOURCES = cconf.cc
-cconf_LDADD = $(LIBGLOBAL_LDA)
-cauthtool_SOURCES = cauthtool.cc
-cauthtool_LDADD = $(LIBGLOBAL_LDA)
-bin_PROGRAMS += ceph cconf cauthtool
+ceph_conf_SOURCES = cconf.cc
+ceph_conf_LDADD = $(LIBGLOBAL_LDA)
+ceph_authtool_SOURCES = cauthtool.cc
+ceph_authtool_LDADD = $(LIBGLOBAL_LDA)
+bin_PROGRAMS += ceph ceph-conf ceph-authtool
 
 monmaptool_SOURCES = monmaptool.cc
 monmaptool_LDADD = $(LIBGLOBAL_LDA)
@@ -110,42 +110,42 @@ librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
 bin_PROGRAMS += librados-config
 
 # synthetic client
-csyn_SOURCES = csyn.cc client/SyntheticClient.cc
-csyn_LDADD = libclient.la libosdc.la $(LIBGLOBAL_LDA)
-bin_PROGRAMS += csyn
+ceph_syn_SOURCES = csyn.cc client/SyntheticClient.cc
+ceph_syn_LDADD = libclient.la libosdc.la $(LIBGLOBAL_LDA)
+bin_PROGRAMS += ceph-syn
 
-core: cmon cosd cmds ceph cephfs librados-config cconf monmaptool osdmaptool crushtool csyn
+core: ceph-mon ceph-osd ceph-mds ceph cephfs librados-config ceph-conf monmaptool osdmaptool crushtool ceph-syn
 
 
 # fuse targets?
 if WITH_FUSE
-cfuse_SOURCES = cfuse.cc client/fuse_ll.cc
-cfuse_LDADD = -lfuse libclient.la libosdc.la $(LIBGLOBAL_LDA)
-cfuse_CXXFLAGS = ${AM_CXXFLAGS}
-bin_PROGRAMS += cfuse
+ceph_fuse_SOURCES = cfuse.cc client/fuse_ll.cc
+ceph_fuse_LDADD = -lfuse libclient.la libosdc.la $(LIBGLOBAL_LDA)
+ceph_fuse_CXXFLAGS = ${AM_CXXFLAGS}
+bin_PROGRAMS += ceph-fuse
 
 endif
 
 # tcmalloc?
 if WITH_TCMALLOC
 tcmalloc_safety_flags = -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
-cosd_LDADD += -ltcmalloc
-cosd_CXXFLAGS += ${tcmalloc_safety_flags}
-cosd_SOURCES += perfglue/heap_profiler.cc
-cmds_LDADD += -ltcmalloc
-cmds_CXXFLAGS += ${tcmalloc_safety_flags}
-cmds_SOURCES += perfglue/heap_profiler.cc
-cmon_LDADD += -ltcmalloc
-cmon_CXXFLAGS += ${tcmalloc_safety_flags}
-cmon_SOURCES += perfglue/heap_profiler.cc
+ceph_osd_LDADD += -ltcmalloc
+ceph_osd_CXXFLAGS += ${tcmalloc_safety_flags}
+ceph_osd_SOURCES += perfglue/heap_profiler.cc
+ceph_mds_LDADD += -ltcmalloc
+ceph_mds_CXXFLAGS += ${tcmalloc_safety_flags}
+ceph_mds_SOURCES += perfglue/heap_profiler.cc
+ceph_mon_LDADD += -ltcmalloc
+ceph_mon_CXXFLAGS += ${tcmalloc_safety_flags}
+ceph_mon_SOURCES += perfglue/heap_profiler.cc
 if WITH_FUSE
-cfuse_LDADD += -ltcmalloc
-cfuse_CXXFLAGS += ${tcmalloc_safety_flags}
+ceph_fuse_LDADD += -ltcmalloc
+ceph_fuse_CXXFLAGS += ${tcmalloc_safety_flags}
 endif #WITH_FUSE
 else
-cosd_SOURCES += perfglue/disabled_heap_profiler.cc
-cmds_SOURCES += perfglue/disabled_heap_profiler.cc
-cmon_SOURCES += perfglue/disabled_heap_profiler.cc
+ceph_osd_SOURCES += perfglue/disabled_heap_profiler.cc
+ceph_mds_SOURCES += perfglue/disabled_heap_profiler.cc
+ceph_mon_SOURCES += perfglue/disabled_heap_profiler.cc
 endif # WITH_TCMALLOC
 
 # debug targets
@@ -650,7 +650,7 @@ editpaths = sed \
 	-e 's|@prefix[@]|$(prefix)|g' \
 	-e 's|@@GCOV_PREFIX_STRIP[@][@]|$(GCOV_PREFIX_STRIP)|g'
 
-init-ceph mkcephfs cdebugpack ceph-coverage: init-ceph.in mkcephfs.in Makefile cdebugpack.in ceph-coverage.in
+init-ceph mkcephfs ceph-debugpack ceph-coverage: init-ceph.in mkcephfs.in Makefile ceph-debugpack.in ceph-coverage.in
 	rm -f $@ $@.tmp
 	$(editpaths) '$(srcdir)/$@.in' >$@.tmp
 	chmod +x $@.tmp
@@ -701,11 +701,11 @@ endif
 # extra bits
 EXTRA_DIST = $(srcdir)/verify-mds-journal.sh $(srcdir)/vstart.sh $(srcdir)/stop.sh \
 	crun $(srcdir)/ceph_common.sh $(srcdir)/init-ceph.in $(srcdir)/mkcephfs.in \
-	$(srcdir)/cdebugpack.in \
+	$(srcdir)/ceph-debugpack.in \
 	$(srcdir)/ceph-coverage.in \
-	$(srcdir)/cclsinfo $(srcdir)/make_version $(srcdir)/check_version \
+	$(srcdir)/ceph-clsinfo $(srcdir)/make_version $(srcdir)/check_version \
 	$(srcdir)/.git_version \
-	$(srcdir)/crbdnamer \
+	$(srcdir)/ceph-rbdnamer \
 	$(ceph_tool_gui_DATA)
 
 # work around old versions of automake that don't define $docdir
diff --git a/src/cconf.cc b/src/cconf.cc
index 3661d7ab104..1228b42765f 100644
--- a/src/cconf.cc
+++ b/src/cconf.cc
@@ -35,7 +35,7 @@ static void usage()
   cerr << "Ceph configuration query tool\n\
 \n\
 USAGE\n\
-cconf <flags> <action>\n\
+ceph-conf <flags> <action>\n\
 \n\
 ACTIONS\n\
   -L|--list-all-sections          List all sections\n\
@@ -58,10 +58,10 @@ FLAGS\n\
 If there is no action given, the action will default to --lookup.\n\
 \n\
 EXAMPLES\n\
-$ cconf --name mon.0 -c /etc/ceph/ceph.conf 'mon addr'\n\
+$ ceph-conf --name mon.0 -c /etc/ceph/ceph.conf 'mon addr'\n\
 Find out what the value of 'mon add' is for monitor 0.\n\
 \n\
-$ cconf -l mon\n\
+$ ceph-conf -l mon\n\
 List sections beginning with 'mon'.\n\
 \n\
 RETURN CODE\n\
diff --git a/src/cclsinfo b/src/ceph-clsinfo
index 5615af48524..5615af48524 100755
--- a/src/cclsinfo
+++ b/src/ceph-clsinfo
diff --git a/src/cdebugpack.in b/src/ceph-debugpack.in
index 87258840833..d0eae867478 100644
--- a/src/cdebugpack.in
+++ b/src/ceph-debugpack.in
@@ -62,7 +62,7 @@ done
 # get absolute path for dest_tar
 [ `echo $dest_tar | cut -c 1` != "/" ] && dest_tar="`pwd`/$dest_tar"
 
-bins="cmon cmds cosd"
+bins="ceph-mon ceph-mds ceph-osd"
 core_paths="/ $BINDIR $BINDBGDIR"
 [ "$conf" = "" ] && conf=$ETCDIR/ceph.conf
 log_path=`$CCONF -c $conf "log dir"`
diff --git a/src/crbdnamer b/src/ceph-rbdnamer
index 4d58d39d69f..4d58d39d69f 100755
--- a/src/crbdnamer
+++ b/src/ceph-rbdnamer
diff --git a/src/crun b/src/ceph-run
index 096cd7391f3..096cd7391f3 100755
--- a/src/crun
+++ b/src/ceph-run
diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 1da42bd9436..a26aac6071b 100644
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CCONF="$BINDIR/cconf"
+CCONF="$BINDIR/ceph-conf"
 
 default_conf=$ETCDIR"/ceph.conf"
 conf=$default_conf
diff --git a/src/cfuse.cc b/src/cfuse.cc
index 53c4042eebd..552de42c5a7 100644
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -41,12 +41,12 @@ using namespace std;
 
 void usage()
 {
-  cerr << "usage: cfuse [-m mon-ip-addr:mon-port] <mount point>" << std::endl;
+  cerr << "usage: ceph-fuse [-m mon-ip-addr:mon-port] <mount point>" << std::endl;
 }
 
 int main(int argc, const char **argv, const char *envp[]) {
   int filer_flags = 0;
-  //cerr << "cfuse starting " << myrank << "/" << world << std::endl;
+  //cerr << "ceph-fuse starting " << myrank << "/" << world << std::endl;
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
@@ -102,7 +102,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   if (g_conf->daemonize) {
     int r = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
     if (r < 0) {
-      cerr << "cfuse[" << getpid() << "]: unable to create socketpair: " << strerror(errno) << std::endl;
+      cerr << "ceph-fuse[" << getpid() << "]: unable to create socketpair: " << strerror(errno) << std::endl;
       exit(1);
     }
 
@@ -115,7 +115,7 @@ int main(int argc, const char **argv, const char *envp[]) {
     //cout << "child, mounting" << std::endl;
     ::close(fd[0]);
 
-    cout << "cfuse[" << getpid() << "]: starting ceph client" << std::endl;
+    cout << "ceph-fuse[" << getpid() << "]: starting ceph client" << std::endl;
     messenger->start_with_nonce(getpid());
 
     // start client
@@ -125,13 +125,13 @@ int main(int argc, const char **argv, const char *envp[]) {
     // use my argc, argv (make sure you pass a mount point!)
     int r = client->mount(g_conf->client_mountpoint.c_str());
     if (r < 0) {
-      cerr << "cfuse[" << getpid() << "]: ceph mount failed with " << strerror(-r) << std::endl;
+      cerr << "ceph-fuse[" << getpid() << "]: ceph mount failed with " << strerror(-r) << std::endl;
       goto out_shutdown;
     }
     
-    cerr << "cfuse[" << getpid() << "]: starting fuse" << std::endl;
+    cerr << "ceph-fuse[" << getpid() << "]: starting fuse" << std::endl;
     r = ceph_fuse_ll_main(client, argc, argv, fd[1]);
-    cerr << "cfuse[" << getpid() << "]: fuse finished with error " << r << std::endl;
+    cerr << "ceph-fuse[" << getpid() << "]: fuse finished with error " << r << std::endl;
     
     client->unmount();
     //cout << "unmounted" << std::endl;
@@ -165,9 +165,9 @@ int main(int argc, const char **argv, const char *envp[]) {
       ::close(1);
       ::close(2);
     } else if (err)
-      cerr << "cfuse[" << getpid() << "]: mount failed: " << strerror(-err) << std::endl;
+      cerr << "ceph-fuse[" << getpid() << "]: mount failed: " << strerror(-err) << std::endl;
     else
-      cerr << "cfuse[" << getpid() << "]: mount failed: " << strerror(-r) << std::endl;
+      cerr << "ceph-fuse[" << getpid() << "]: mount failed: " << strerror(-r) << std::endl;
     return r;
   }
 }
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 073f12bb4f3..3a660e03664 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4607,7 +4607,7 @@ struct dirent * Client::readdir(dir_result_t *d)
   sr.full = false;
 
   /*
-   * Return mechanisms are non-obvious (callback appears intended for multi-read mechanism like cfuse)
+   * Return mechanisms are non-obvious (callback appears intended for multi-read mechanism like ceph-fuse)
    * readdir_r_cb=0 end of directory reached on prior call
    * readdir_r_cb=0 entry filled and offset now at end of the directory
    * readdir_r_cb=-1 entry is filled successfully, not end of dir
diff --git a/src/cmds.cc b/src/cmds.cc
index a561792569b..243ca0e619e 100644
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -41,7 +41,7 @@ using namespace std;
 
 void usage()
 {
-  derr << "usage: cmds -i name [flags] [[--journal_check rank]|[--hot-standby][rank]]\n"
+  derr << "usage: ceph-mds -i name [flags] [[--journal_check rank]|[--hot-standby][rank]]\n"
        << "  -m monitorip:port\n"
        << "        connect to monitor at given address\n"
        << "  --debug_mds n\n"
@@ -201,7 +201,7 @@ int main(int argc, const char **argv)
 
   // Normal startup
   if (g_conf->name.has_default_id()) {
-    derr << "must specify '-i name' with the cmds instance name" << dendl;
+    derr << "must specify '-i name' with the ceph-mds instance name" << dendl;
     usage();
   }
 
@@ -266,7 +266,7 @@ int main(int argc, const char **argv)
   char s[20];
   snprintf(s, sizeof(s), "gmon/%d", getpid());
   if ((mkdir(s, 0755) == 0) && (chdir(s) == 0)) {
-    dout(0) << "cmds: gmon.out should be in " << s << dendl;
+    dout(0) << "ceph-mds: gmon.out should be in " << s << dendl;
   }
 
   generic_dout(0) << "stopped." << dendl;
diff --git a/src/cmon.cc b/src/cmon.cc
index 9e7f5803ce6..5393ebeecce 100644
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -39,7 +39,7 @@ extern CompatSet get_ceph_mon_feature_compat_set();
 
 void usage()
 {
-  cerr << "usage: cmon -i monid [--mon-data=pathtodata] [flags]" << std::endl;
+  cerr << "usage: ceph-mon -i monid [--mon-data=pathtodata] [flags]" << std::endl;
   cerr << "  --debug_mon n\n";
   cerr << "        debug monitor level (e.g. 10)\n";
   cerr << "  --mkfs\n";
@@ -300,7 +300,7 @@ int main(int argc, const char **argv)
   char s[20];
   snprintf(s, sizeof(s), "gmon/%d", getpid());
   if ((mkdir(s, 0755) == 0) && (chdir(s) == 0)) {
-    dout(0) << "cmon: gmon.out should be in " << s << dendl;
+    dout(0) << "ceph-mon: gmon.out should be in " << s << dendl;
   }
 
   return 0;
diff --git a/src/cosd.cc b/src/cosd.cc
index e2ce3cc347d..5d50349afe0 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -42,7 +42,7 @@ using namespace std;
 
 void usage() 
 {
-  derr << "usage: cosd -i osdid [--osd-data=path] [--osd-journal=path] "
+  derr << "usage: ceph-osd -i osdid [--osd-data=path] [--osd-journal=path] "
        << "[--mkfs] [--mkjournal] [--convert-filestore]" << dendl;
   derr << "   --debug_osd N   set debug level (e.g. 10)" << dendl;
   generic_server_usage();
@@ -356,7 +356,7 @@ int main(int argc, const char **argv)
   char s[20];
   snprintf(s, sizeof(s), "gmon/%d", getpid());
   if ((mkdir(s, 0755) == 0) && (chdir(s) == 0)) {
-    dout(0) << "cosd: gmon.out should be in " << s << dendl;
+    dout(0) << "ceph-osd: gmon.out should be in " << s << dendl;
   }
 
   return 0;
diff --git a/src/csyn.cc b/src/csyn.cc
index cc58ce53c52..e1a6bdb43ce 100644
--- a/src/csyn.cc
+++ b/src/csyn.cc
@@ -42,7 +42,7 @@ extern int syn_filer_flags;
 
 int main(int argc, const char **argv, char *envp[]) 
 {
-  //cerr << "csyn starting" << std::endl;
+  //cerr << "ceph-syn starting" << std::endl;
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
@@ -63,7 +63,7 @@ int main(int argc, const char **argv, char *envp[])
   SimpleMessenger* messengers[g_conf->num_client];
   MonClient* mclients[g_conf->num_client];
 
-  cout << "csyn: starting " << g_conf->num_client << " syn client(s)" << std::endl;
+  cout << "ceph-syn: starting " << g_conf->num_client << " syn client(s)" << std::endl;
   for (int i=0; i<g_conf->num_client; i++) {
     messengers[i] = new SimpleMessenger(g_ceph_context);
     messengers[i]->register_entity(entity_name_t(entity_name_t::TYPE_CLIENT,-1));
diff --git a/src/init-ceph.in b/src/init-ceph.in
index f4329788c47..0bc69926e32 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -249,7 +249,7 @@ for name in $what; do
 	    runarg=""
 	    
 	    [ -z "$crun" ] && get_conf_bool crun "0" "restart on core dump"
-	    [ "$crun" -eq 1 ] && wrap="$BINDIR/crun"
+	    [ "$crun" -eq 1 ] && wrap="$BINDIR/ceph-run"
 	    
 	    [ -z "$dovalgrind" ] && get_conf_bool valgrind "" "valgrind"
 	    [ -n "$valgrind" ] && wrap="$wrap valgrind $valgrind"
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 2ecde4c7f87..7770c78a6aa 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -230,8 +230,8 @@ create_private_key()
 {
     get_conf keyring "$dir/keyring.$name" "keyring"
     echo "creating private key for $name keyring $keyring"
-    $BINDIR/cauthtool --create-keyring --gen-key -n $name $keyring
-    $BINDIR/cauthtool -p -n $name $keyring > $dir/key.$name
+    $BINDIR/ceph-authtool --create-keyring --gen-key -n $name $keyring
+    $BINDIR/ceph-authtool -p -n $name $keyring > $dir/key.$name
 }
 
 if [ -n "$initdaemon" ]; then
@@ -253,7 +253,7 @@ if [ -n "$initdaemon" ]; then
     fi
 
     if [ $type = "osd" ]; then
-	$BINDIR/cosd -c $conf --monmap $dir/monmap -i $id --mkfs
+	$BINDIR/ceph-osd -c $conf --monmap $dir/monmap -i $id --mkfs
 	create_private_key
     fi
     
@@ -262,7 +262,7 @@ if [ -n "$initdaemon" ]; then
     fi
 
     if [ $type = "mon" ]; then
-	$BINDIR/cmon -c $conf --mkfs -i $id --monmap $dir/monmap --osdmap $dir/osdmap -k $dir/keyring.mon
+	$BINDIR/ceph-mon -c $conf --mkfs -i $id --monmap $dir/monmap --osdmap $dir/osdmap -k $dir/keyring.mon
     fi
     
     exit 0
@@ -370,18 +370,18 @@ if [ $preparemon -eq 1 ]; then
 
     # admin keyring
     echo Generating admin key at $dir/keyring.admin
-    $BINDIR/cauthtool --create-keyring --gen-key -n client.admin $dir/keyring.admin
+    $BINDIR/ceph-authtool --create-keyring --gen-key -n client.admin $dir/keyring.admin
 
     # mon keyring
     echo Building initial monitor keyring
     cp $dir/keyring.admin $dir/keyring.mon
-    $BINDIR/cauthtool -n client.admin --set-uid=0 \
+    $BINDIR/ceph-authtool -n client.admin --set-uid=0 \
 	--cap mon 'allow *' \
 	--cap osd 'allow *' \
 	--cap mds 'allow' \
 	$dir/keyring.mon
 
-    $BINDIR/cauthtool --gen-key -n mon. $dir/keyring.mon
+    $BINDIR/ceph-authtool --gen-key -n mon. $dir/keyring.mon
 
     for k in $dir/key.*
     do
@@ -391,12 +391,12 @@ if [ $preparemon -eq 1 ]; then
 	kname="$ktype.$kid"
 	secret=`cat $k`
 	if [ "$ktype" = "osd" ]; then
-	    $BINDIR/cauthtool -n $kname --add-key $secret $dir/keyring.mon \
+	    $BINDIR/ceph-authtool -n $kname --add-key $secret $dir/keyring.mon \
 		--cap mon 'allow rwx' \
 		--cap osd 'allow *'
 	fi
 	if [ "$ktype" = "mds" ]; then
-	    $BINDIR/cauthtool -n $kname --add-key $secret $dir/keyring.mon \
+	    $BINDIR/ceph-authtool -n $kname --add-key $secret $dir/keyring.mon \
 		--cap mon "allow rwx" \
 		--cap osd 'allow *' \
 		--cap mds 'allow'
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index b895c2b2a26..6388cda0961 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1093,7 +1093,7 @@ int Monitor::mkfs(bufferlist& osdmapbl)
   magicbl.append("\n");
   int r = store->put_bl_ss(magicbl, "magic", 0);
   if (r < 0) {
-    dout(0) << TEXT_RED << "** ERROR: initializing cmon failed: couldn't "
+    dout(0) << TEXT_RED << "** ERROR: initializing ceph-mon failed: couldn't "
 	    << "initialize the monitor state machine: " << cpp_strerror(r)
 	    << TEXT_NORMAL << dendl;
     exit(1);
diff --git a/src/mon/MonitorStore.cc b/src/mon/MonitorStore.cc
index 81136a91bd8..977ed7ff946 100644
--- a/src/mon/MonitorStore.cc
+++ b/src/mon/MonitorStore.cc
@@ -65,7 +65,7 @@ int MonitorStore::mount()
   l.l_len = 0;
   int r = ::fcntl(lock_fd, F_SETLK, &l);
   if (r < 0) {
-    dout(0) << "failed to lock " << t << ", is another cmon still running?" << dendl;
+    dout(0) << "failed to lock " << t << ", is another ceph-mon still running?" << dendl;
     return -errno;
   }
 
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index c655eb3acdd..6cbc27697f0 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1016,7 +1016,7 @@ int FileStore::lock_fsid()
   int r = ::fcntl(fsid_fd, F_SETLK, &l);
   if (r < 0) {
     char buf[80];
-    dout(0) << "lock_fsid failed to lock " << basedir << "/fsid, is another cosd still running? " << strerror_r(errno, buf, sizeof(buf)) << dendl;
+    dout(0) << "lock_fsid failed to lock " << basedir << "/fsid, is another ceph-osd still running? " << strerror_r(errno, buf, sizeof(buf)) << dendl;
     return -errno;
   }
   return 0;
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8d24408a077..298bbf8d467 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -614,7 +614,7 @@ int OSD::pre_init()
 
   if (store->test_mount_in_use()) {
     derr << "OSD::pre_init: object store '" << dev_path << "' is "
-         << "currently in use. (Is cosd already running?)" << dendl;
+         << "currently in use. (Is ceph-osd already running?)" << dendl;
     return -EBUSY;
   }
   return 0;
diff --git a/src/ps-ceph.pl b/src/ps-ceph.pl
index e50a8574d22..dc236296494 100755
--- a/src/ps-ceph.pl
+++ b/src/ps-ceph.pl
@@ -17,10 +17,10 @@ sub is_ceph_proc {
         return 0 if $cmdline =~ /\bps-ceph.pl\b/;
 
         return 1 if $cmdline =~ /\bceph\b/;
-        return 1 if $cmdline =~ /\bcfuse\b/;
-        return 1 if $cmdline =~ /\bcmds\b/;
-        return 1 if $cmdline =~ /\bcmon\b/;
-        return 1 if $cmdline =~ /\bcosd\b/;
+        return 1 if $cmdline =~ /\bceph-fuse\b/;
+        return 1 if $cmdline =~ /\bceph-mds\b/;
+        return 1 if $cmdline =~ /\bceph-mon\b/;
+        return 1 if $cmdline =~ /\bceph-osd\b/;
         return 1 if $cmdline =~ /\bosdmaptool\b/;
         return 1 if $cmdline =~ /\brados\b/;
         return 1 if $cmdline =~ /test_/;
diff --git a/src/script/check_pglog.sh b/src/script/check_pglog.sh
index 2dd564d9edc..48976f0a513 100755
--- a/src/script/check_pglog.sh
+++ b/src/script/check_pglog.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-cosd=`which cosd`
-[ -z "$cosd" ] && cosd="./cosd"
+cosd=`which ceph-osd`
+[ -z "$cosd" ] && cosd="./ceph-osd"
 
 bad=0
 for f in $1/current/meta/pglog*
diff --git a/src/stop.sh b/src/stop.sh
index 1274f36b390..604cd91dedf 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -3,7 +3,7 @@
 test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
 
 do_killall() {
-	pg=`pgrep -f crun.*$1`
+	pg=`pgrep -f ceph-run.*$1`
 	[ -n "$pg" ] && kill $pg
 	$SUDO killall $1
 }
@@ -20,15 +20,15 @@ while [ $# -ge 1 ]; do
 	all )
 	    stop_all=1
 	    ;;
-	mon | cmon )
+	mon | ceph-mon )
 	    stop_mon=1
 	    stop_all=0
 	    ;;
-	mds | cmds )
+	mds | ceph-mds )
 	    stop_mds=1
 	    stop_all=0
 	    ;;
-	osd | cosd )
+	osd | ceph-osd )
 	    stop_osd=1
 	    stop_all=0
 	    ;;
@@ -40,12 +40,12 @@ while [ $# -ge 1 ]; do
 done
 
 if [ $stop_all -eq 1 ]; then
-	killall cmon cmds cosd
-	pkill -f valgrind.bin.\*cmon
-	$SUDO pkill -f valgrind.bin.\*cosd
-	pkill -f valgrind.bin.\*cmds
+	killall ceph-mon ceph-mds ceph-osd
+	pkill -f valgrind.bin.\*ceph-mon
+	$SUDO pkill -f valgrind.bin.\*ceph-osd
+	pkill -f valgrind.bin.\*ceph-mds
 else
-	[ $stop_mon -eq 1 ] && do_killall cmon
-	[ $stop_mds -eq 1 ] && do_killall cmds
-	[ $stop_osd -eq 1 ] && do_killall cosd
+	[ $stop_mon -eq 1 ] && do_killall ceph-mon
+	[ $stop_mds -eq 1 ] && do_killall ceph-mds
+	[ $stop_osd -eq 1 ] && do_killall ceph-osd
 fi
diff --git a/src/test/cli/cauthtool/add-key-segv.t b/src/test/cli/cauthtool/add-key-segv.t
index 696a80a574f..724deb0b6f3 100644
--- a/src/test/cli/cauthtool/add-key-segv.t
+++ b/src/test/cli/cauthtool/add-key-segv.t
@@ -1,6 +1,6 @@
-  $ cauthtool kring --create-keyring
+  $ ceph-authtool kring --create-keyring
   creating kring
 
-  $ cauthtool kring --add-key 'FAKEBASE64 foo'
+  $ ceph-authtool kring --add-key 'FAKEBASE64 foo'
   can't decode key 'FAKEBASE64 foo'
   [1]
diff --git a/src/test/cli/cauthtool/add-key.t b/src/test/cli/cauthtool/add-key.t
index 8ae94ea6992..d991b6767fd 100644
--- a/src/test/cli/cauthtool/add-key.t
+++ b/src/test/cli/cauthtool/add-key.t
@@ -1,11 +1,11 @@
-  $ cauthtool kring --create-keyring
+  $ ceph-authtool kring --create-keyring
   creating kring
 
-  $ cauthtool kring --add-key 'AQAK7yxNeF+nHBAA0SgSdbs8IkJrxroDeJ6SwQ== 18446744073709551615'
+  $ ceph-authtool kring --add-key 'AQAK7yxNeF+nHBAA0SgSdbs8IkJrxroDeJ6SwQ== 18446744073709551615'
   added entity client.admin auth auth(auid = 18446744073709551615 key=AQAK7yxNeF+nHBAA0SgSdbs8IkJrxroDeJ6SwQ== with 0 caps)
 
 # cram makes matching escape-containing lines with regexps a bit ugly
-  $ cauthtool kring --list
+  $ ceph-authtool kring --list
   [client.admin]
   \tkey = AQAK7yxNeF+nHBAA0SgSdbs8IkJrxroDeJ6SwQ== (esc)
   \tauid = 18446744073709551615 (esc)
diff --git a/src/test/cli/cauthtool/cap-bin.t b/src/test/cli/cauthtool/cap-bin.t
index 9f34c19dd42..c0adb1f5364 100644
--- a/src/test/cli/cauthtool/cap-bin.t
+++ b/src/test/cli/cauthtool/cap-bin.t
@@ -1,6 +1,6 @@
-  $ cauthtool kring --create-keyring --gen-key --bin
+  $ ceph-authtool kring --create-keyring --gen-key --bin
   creating kring
 
-  $ cauthtool --cap osd 'allow rx pool=swimming' --bin kring
-  $ cauthtool kring --list|grep -P '^\tcaps '
+  $ ceph-authtool --cap osd 'allow rx pool=swimming' --bin kring
+  $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps osd = "allow rx pool=swimming" (esc)
diff --git a/src/test/cli/cauthtool/cap-invalid.t b/src/test/cli/cauthtool/cap-invalid.t
index e655c205bfe..c857e26ab52 100644
--- a/src/test/cli/cauthtool/cap-invalid.t
+++ b/src/test/cli/cauthtool/cap-invalid.t
@@ -1,12 +1,12 @@
-  $ cauthtool kring --create-keyring --gen-key
+  $ ceph-authtool kring --create-keyring --gen-key
   creating kring
 
 # TODO is this nice?
-  $ cauthtool --cap osd 'broken' kring
-  $ cauthtool kring --list|grep -P '^\tcaps '
+  $ ceph-authtool --cap osd 'broken' kring
+  $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps osd = "broken" (esc)
 
 # TODO is this nice?
-  $ cauthtool --cap xyzzy 'broken' kring
-  $ cauthtool kring --list|grep -P '^\tcaps '
+  $ ceph-authtool --cap xyzzy 'broken' kring
+  $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps xyzzy = "broken" (esc)
diff --git a/src/test/cli/cauthtool/cap-overwrite.t b/src/test/cli/cauthtool/cap-overwrite.t
index f6b46753c2c..30788dfd4fd 100644
--- a/src/test/cli/cauthtool/cap-overwrite.t
+++ b/src/test/cli/cauthtool/cap-overwrite.t
@@ -1,11 +1,11 @@
-  $ cauthtool kring --create-keyring --gen-key
+  $ ceph-authtool kring --create-keyring --gen-key
   creating kring
 
-  $ cauthtool --cap osd 'allow rx pool=swimming' kring
-  $ cauthtool kring --list|grep -P '^\tcaps '
+  $ ceph-authtool --cap osd 'allow rx pool=swimming' kring
+  $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps osd = "allow rx pool=swimming" (esc)
 
 # TODO it seems --cap overwrites all previous caps; is this wanted?
-  $ cauthtool --cap mds 'allow' kring
-  $ cauthtool kring --list|grep -P '^\tcaps '
+  $ ceph-authtool --cap mds 'allow' kring
+  $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps mds = "allow" (esc)
diff --git a/src/test/cli/cauthtool/cap.t b/src/test/cli/cauthtool/cap.t
index 05fdac613e5..3d9ae706e73 100644
--- a/src/test/cli/cauthtool/cap.t
+++ b/src/test/cli/cauthtool/cap.t
@@ -1,8 +1,8 @@
-  $ cauthtool kring --create-keyring --gen-key
+  $ ceph-authtool kring --create-keyring --gen-key
   creating kring
 
-  $ cauthtool --cap osd 'allow rx pool=swimming' kring
-  $ cauthtool kring --list|grep -P '^\tcaps '
+  $ ceph-authtool --cap osd 'allow rx pool=swimming' kring
+  $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps osd = "allow rx pool=swimming" (esc)
 
   $ cat kring
diff --git a/src/test/cli/cauthtool/create-gen-list-bin.t b/src/test/cli/cauthtool/create-gen-list-bin.t
index 34475e0ad54..a24f6acdd77 100644
--- a/src/test/cli/cauthtool/create-gen-list-bin.t
+++ b/src/test/cli/cauthtool/create-gen-list-bin.t
@@ -1,22 +1,22 @@
-  $ cauthtool kring --create-keyring --bin
+  $ ceph-authtool kring --create-keyring --bin
   creating kring
 
-  $ cauthtool kring --list --bin
+  $ ceph-authtool kring --list --bin
 
 # --list actually does not use --bin, but autodetects; run it both
 # ways just to trigger that
-  $ cauthtool kring --list
+  $ ceph-authtool kring --list
 
-  $ cauthtool kring --gen-key --bin
+  $ ceph-authtool kring --gen-key --bin
 
 # cram makes matching escape-containing lines with regexps a bit ugly
-  $ cauthtool kring --list
+  $ ceph-authtool kring --list
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
   \\tauid = [0-9]{20} \(esc\) (re)
 
 # synonym
-  $ cauthtool kring -l
+  $ ceph-authtool kring -l
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
   \\tauid = [0-9]{20} \(esc\) (re)
diff --git a/src/test/cli/cauthtool/create-gen-list.t b/src/test/cli/cauthtool/create-gen-list.t
index 680b964170e..abd44eca283 100644
--- a/src/test/cli/cauthtool/create-gen-list.t
+++ b/src/test/cli/cauthtool/create-gen-list.t
@@ -1,18 +1,18 @@
-  $ cauthtool kring --create-keyring
+  $ ceph-authtool kring --create-keyring
   creating kring
 
-  $ cauthtool kring --list
+  $ ceph-authtool kring --list
 
-  $ cauthtool kring --gen-key
+  $ ceph-authtool kring --gen-key
 
 # cram makes matching escape-containing lines with regexps a bit ugly
-  $ cauthtool kring --list
+  $ ceph-authtool kring --list
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
   \\tauid = [0-9]{20} \(esc\) (re)
 
 # synonym
-  $ cauthtool kring -l
+  $ ceph-authtool kring -l
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
   \\tauid = [0-9]{20} \(esc\) (re)
diff --git a/src/test/cli/cauthtool/help.t b/src/test/cli/cauthtool/help.t
index 9ac165d7118..d19330a1ca7 100644
--- a/src/test/cli/cauthtool/help.t
+++ b/src/test/cli/cauthtool/help.t
@@ -1,7 +1,7 @@
 # TODO synchronize with man page
-  $ cauthtool --help
+  $ ceph-authtool --help
   no command specified
-  usage: cauthtool keyringfile [OPTIONS]...
+  usage: ceph-authtool keyringfile [OPTIONS]...
   where the options are:
     -l, --list                    will list all keys and capabilities present in
                                   the keyring
diff --git a/src/test/cli/cauthtool/list-empty-bin.t b/src/test/cli/cauthtool/list-empty-bin.t
index 33ec16d48e5..f8d517f8931 100644
--- a/src/test/cli/cauthtool/list-empty-bin.t
+++ b/src/test/cli/cauthtool/list-empty-bin.t
@@ -1,5 +1,5 @@
   $ touch empty
 
-  $ cauthtool --list --bin empty
+  $ ceph-authtool --list --bin empty
 
-  $ cauthtool -l --bin empty
+  $ ceph-authtool -l --bin empty
diff --git a/src/test/cli/cauthtool/list-empty.t b/src/test/cli/cauthtool/list-empty.t
index 16fbefa4018..1b465fe6560 100644
--- a/src/test/cli/cauthtool/list-empty.t
+++ b/src/test/cli/cauthtool/list-empty.t
@@ -1,5 +1,5 @@
   $ touch empty
 
-  $ cauthtool --list empty
+  $ ceph-authtool --list empty
 
-  $ cauthtool -l empty
+  $ ceph-authtool -l empty
diff --git a/src/test/cli/cauthtool/list-nonexistent-bin.t b/src/test/cli/cauthtool/list-nonexistent-bin.t
index 38169065159..3da68883896 100644
--- a/src/test/cli/cauthtool/list-nonexistent-bin.t
+++ b/src/test/cli/cauthtool/list-nonexistent-bin.t
@@ -1,7 +1,7 @@
-  $ cauthtool --list --bin nonexistent
+  $ ceph-authtool --list --bin nonexistent
   can't open nonexistent: can't open nonexistent: error 2: No such file or directory
   [1]
 
-  $ cauthtool -l --bin nonexistent
+  $ ceph-authtool -l --bin nonexistent
   can't open nonexistent: can't open nonexistent: error 2: No such file or directory
   [1]
diff --git a/src/test/cli/cauthtool/list-nonexistent.t b/src/test/cli/cauthtool/list-nonexistent.t
index 792bbac8a09..7b8e73d985d 100644
--- a/src/test/cli/cauthtool/list-nonexistent.t
+++ b/src/test/cli/cauthtool/list-nonexistent.t
@@ -1,7 +1,7 @@
-  $ cauthtool --list nonexistent
+  $ ceph-authtool --list nonexistent
   can't open nonexistent: can't open nonexistent: error 2: No such file or directory
   [1]
 
-  $ cauthtool -l nonexistent
+  $ ceph-authtool -l nonexistent
   can't open nonexistent: can't open nonexistent: error 2: No such file or directory
   [1]
diff --git a/src/test/cli/cauthtool/manpage.t b/src/test/cli/cauthtool/manpage.t
index 81d3b4f2ae1..188a1e14788 100644
--- a/src/test/cli/cauthtool/manpage.t
+++ b/src/test/cli/cauthtool/manpage.t
@@ -1,6 +1,6 @@
-  $ cauthtool
-  cauthtool: must specify filename
-  usage: cauthtool keyringfile [OPTIONS]...
+  $ ceph-authtool
+  ceph-authtool: must specify filename
+  usage: ceph-authtool keyringfile [OPTIONS]...
   where the options are:
     -l, --list                    will list all keys and capabilities present in
                                   the keyring
@@ -20,7 +20,7 @@
 
 # demonstrate that manpage examples fail without config
 # TODO fix the manpage
-  $ cauthtool --create-keyring --name client.foo --gen-key keyring
+  $ ceph-authtool --create-keyring --name client.foo --gen-key keyring
   creating keyring
 
 # work around the above
@@ -28,19 +28,19 @@
 
 To create a new keyring containing a key for client.foo:
 
-  $ cauthtool --create-keyring --id foo --gen-key keyring.bin
+  $ ceph-authtool --create-keyring --id foo --gen-key keyring.bin
   creating keyring.bin
 
-  $ cauthtool --create-keyring --name client.foo --gen-key keyring.bin
+  $ ceph-authtool --create-keyring --name client.foo --gen-key keyring.bin
   creating keyring.bin
 
 To associate some capabilities with the key (namely, the ability to mount a Ceph filesystem):
 
-  $ cauthtool -n client.foo --cap mds 'allow' --cap osd 'allow rw pool=data' --cap mon 'allow r' keyring.bin
+  $ ceph-authtool -n client.foo --cap mds 'allow' --cap osd 'allow rw pool=data' --cap mon 'allow r' keyring.bin
 
 To display the contents of the keyring:
 
-  $ cauthtool -l keyring.bin
+  $ ceph-authtool -l keyring.bin
   [client.foo]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
   \\tauid = [0-9]{20} \(esc\) (re)
diff --git a/src/test/cli/cauthtool/simple.t b/src/test/cli/cauthtool/simple.t
index 059d244e0d5..e2317d45a05 100644
--- a/src/test/cli/cauthtool/simple.t
+++ b/src/test/cli/cauthtool/simple.t
@@ -1,6 +1,6 @@
-  $ cauthtool
-  cauthtool: must specify filename
-  usage: cauthtool keyringfile [OPTIONS]...
+  $ ceph-authtool
+  ceph-authtool: must specify filename
+  usage: ceph-authtool keyringfile [OPTIONS]...
   where the options are:
     -l, --list                    will list all keys and capabilities present in
                                   the keyring
diff --git a/src/test/cli/cconf/env-vs-args.t b/src/test/cli/cconf/env-vs-args.t
index ae936804088..193e40c2d60 100644
--- a/src/test/cli/cconf/env-vs-args.t
+++ b/src/test/cli/cconf/env-vs-args.t
@@ -1,10 +1,10 @@
 # we can use CEPH_CONF to override the normal configuration file location.
-  $ env CEPH_CONF=from-env cconf -s foo bar
+  $ env CEPH_CONF=from-env ceph-conf -s foo bar
   global_init: unable to open config file. (re)
   [1]
 
 # command-line arguments should override environment
-  $ env -u CEPH_CONF cconf -c from-args
+  $ env -u CEPH_CONF ceph-conf -c from-args
   global_init: unable to open config file. (re)
   [1]
 
diff --git a/src/test/cli/cconf/help.t b/src/test/cli/cconf/help.t
index 111b320e4a1..3fe8ca3f446 100644
--- a/src/test/cli/cconf/help.t
+++ b/src/test/cli/cconf/help.t
@@ -1,8 +1,8 @@
-  $ cconf --help
+  $ ceph-conf --help
   Ceph configuration query tool
   
   USAGE
-  cconf <flags> <action>
+  ceph-conf <flags> <action>
   
   ACTIONS
     -L|--list-all-sections          List all sections
@@ -25,10 +25,10 @@
   If there is no action given, the action will default to --lookup.
   
   EXAMPLES
-  [$] cconf --name mon.0 -c /etc/ceph/ceph.conf 'mon addr' (re)
+  [$] ceph-conf --name mon.0 -c /etc/ceph/ceph.conf 'mon addr' (re)
   Find out what the value of 'mon add' is for monitor 0.
   
-  [$] cconf -l mon (re)
+  [$] ceph-conf -l mon (re)
   List sections beginning with 'mon'.
   
   RETURN CODE
diff --git a/src/test/cli/cconf/invalid-args.t b/src/test/cli/cconf/invalid-args.t
index 0130dca0d27..e7fdc17856e 100644
--- a/src/test/cli/cconf/invalid-args.t
+++ b/src/test/cli/cconf/invalid-args.t
@@ -4,14 +4,14 @@
   > EOF
 
 # TODO output an error
-  $ cconf -c test.conf broken
+  $ ceph-conf -c test.conf broken
   [1]
 
-  $ cconf -c test.conf --name total.garbage
+  $ ceph-conf -c test.conf --name total.garbage
   You must pass a string of the form TYPE.ID to the --name option. Valid types are: auth, mon, osd, mds, client
   [1]
 
-  $ cconf -c test.conf -s bar
+  $ ceph-conf -c test.conf -s bar
   You must give an action, such as --lookup or --list-all-sections.
   Pass --help for more help.
   [1]
diff --git a/src/test/cli/cconf/manpage.t b/src/test/cli/cconf/manpage.t
index 8340d27718d..425f2718987 100644
--- a/src/test/cli/cconf/manpage.t
+++ b/src/test/cli/cconf/manpage.t
@@ -15,7 +15,7 @@
 
 To extract the value of the "osd data" option for the osd0 daemon,
 
-  $ cconf -c foo.conf "osd data" --name osd.0
+  $ ceph-conf -c foo.conf "osd data" --name osd.0
   /mnt/osd0
 
 This is equivalent to doing specifying sections [osd0], [osd.0],
@@ -23,11 +23,11 @@ This is equivalent to doing specifying sections [osd0], [osd.0],
 
 # TODO the "admin" here seems like an actual bug
 
-  $ cconf -c foo.conf "osd data" -s osd0 -s osd.0 -s osd -s global
+  $ ceph-conf -c foo.conf "osd data" -s osd0 -s osd.0 -s osd -s global
   /mnt/osdadmin
 
 To list all sections that begin with osd:
 
-  $ cconf -c foo.conf -l osd
+  $ ceph-conf -c foo.conf -l osd
   osd
   osd.3
diff --git a/src/test/cli/cconf/option.t b/src/test/cli/cconf/option.t
index d1d63f2367c..a8b5b6e3e2a 100644
--- a/src/test/cli/cconf/option.t
+++ b/src/test/cli/cconf/option.t
@@ -11,14 +11,14 @@
   > other = 42
   > EOF
 
-  $ cconf -c test.conf bar -s foo
+  $ ceph-conf -c test.conf bar -s foo
   blue
 
 # test the funny "equals sign" argument passing convention
-  $ cconf --conf=test.conf bar -s foo
+  $ ceph-conf --conf=test.conf bar -s foo
   blue
 
-  $ cconf --conf=test.conf -L
+  $ ceph-conf --conf=test.conf -L
   bar
   baz
   foo
@@ -26,7 +26,7 @@
   nobar
   thud
 
-  $ cconf --conf=test.conf --list-all-sections
+  $ ceph-conf --conf=test.conf --list-all-sections
   bar
   baz
   foo
@@ -34,7 +34,7 @@
   nobar
   thud
 
-  $ cconf --conf=test.conf --list_all_sections
+  $ ceph-conf --conf=test.conf --list_all_sections
   bar
   baz
   foo
@@ -44,24 +44,24 @@
 
 # TODO man page stops in the middle of a sentence
 
-  $ cconf -c test.conf bar -s xyzzy
+  $ ceph-conf -c test.conf bar -s xyzzy
   [1]
 
-  $ cconf -c test.conf bar -s xyzzy
+  $ ceph-conf -c test.conf bar -s xyzzy
   [1]
 
-  $ cconf -c test.conf bar -s xyzzy -s thud
+  $ ceph-conf -c test.conf bar -s xyzzy -s thud
   red
 
-  $ cconf -c test.conf bar -s nobar -s thud
+  $ ceph-conf -c test.conf bar -s nobar -s thud
   red
 
-  $ cconf -c test.conf bar -s thud -s baz
+  $ ceph-conf -c test.conf bar -s thud -s baz
   red
 
-  $ cconf -c test.conf bar -s baz -s thud
+  $ ceph-conf -c test.conf bar -s baz -s thud
   yellow
 
-  $ cconf -c test.conf bar -s xyzzy -s nobar -s thud -s baz
+  $ ceph-conf -c test.conf bar -s xyzzy -s nobar -s thud -s baz
   red
 
diff --git a/src/test/cli/cconf/sections.t b/src/test/cli/cconf/sections.t
index b4f26da95a6..63063cc9e11 100644
--- a/src/test/cli/cconf/sections.t
+++ b/src/test/cli/cconf/sections.t
@@ -9,10 +9,10 @@
   > bar = yellow
   > EOF
 
-  $ cconf -c test.conf -l bar
+  $ ceph-conf -c test.conf -l bar
   bar
 
-  $ cconf -c test.conf -l b
+  $ ceph-conf -c test.conf -l b
   bar
   baz
 
diff --git a/src/test/cli/cconf/simple.t b/src/test/cli/cconf/simple.t
index 556e2fac16a..043ca203509 100644
--- a/src/test/cli/cconf/simple.t
+++ b/src/test/cli/cconf/simple.t
@@ -1,4 +1,4 @@
-  $ cconf
+  $ ceph-conf
   You must give an action, such as --lookup or --list-all-sections.
   Pass --help for more help.
   [1]
diff --git a/src/test/test_common.sh b/src/test/test_common.sh
index eacfd797481..33c30ec9842 100755
--- a/src/test/test_common.sh
+++ b/src/test/test_common.sh
@@ -45,7 +45,7 @@ stop_osd() {
         if [ -e $pidfile ]; then
                 kill `cat $pidfile` && return 0
         else
-                echo "cosd process $osd_index is not running"
+                echo "ceph-osd process $osd_index is not running"
         fi
         return 1
 }
@@ -53,7 +53,7 @@ stop_osd() {
 # Restart an OSD started by vstart
 restart_osd() {
         osd_index=$1
-        ./cosd -i $osd_index -c ceph.conf &
+        ./ceph-osd -i $osd_index -c ceph.conf &
 }
 
 # Ask the user a yes/no question and get the response
diff --git a/src/test/test_csyn.sh b/src/test/test_csyn.sh
index b722d6a5c96..98003aaf6d0 100644
--- a/src/test/test_csyn.sh
+++ b/src/test/test_csyn.sh
@@ -20,7 +20,7 @@ osd max scrubs = 0' || die "vstart failed"
 }
 
 csyn_simple1_impl() {
-  ./csyn -c ./ceph.conf --syn writefile 100 1000 --syn writefile 100 1000 || die "csyn failed"
+  ./ceph-syn -c ./ceph.conf --syn writefile 100 1000 --syn writefile 100 1000 || die "csyn failed"
 }
 
 csyn_simple1() {
diff --git a/src/verify-mds-journal.sh b/src/verify-mds-journal.sh
index 67f11f1b4b4..22ebac0600f 100755
--- a/src/verify-mds-journal.sh
+++ b/src/verify-mds-journal.sh
@@ -2,7 +2,7 @@
 
 while [ 1 ]
 do
-  ./cmds -f --debug_mds 20 --debug_ms 1 --standby_replay_for 0 || exit 1
+  ./ceph-mds -f --debug_mds 20 --debug_ms 1 --standby_replay_for 0 || exit 1
   echo replay ok, sleeping
   sleep 30
 done
\ No newline at end of file
diff --git a/src/vstart.sh b/src/vstart.sh
index b307471163d..329f740cbaf 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -80,15 +80,15 @@ case $1 in
     --smallmds )
 	    smallmds=1
 	    ;;
-    mon | cmon )
+    mon )
 	    start_mon=1
 	    start_all=0
 	    ;;
-    mds | cmds )
+    mds )
 	    start_mds=1
 	    start_all=0
 	    ;;
-    osd | cosd )
+    osd )
 	    start_osd=1
 	    start_all=0
 	    ;;
@@ -137,8 +137,8 @@ run() {
 	    echo "$*"
 	    $*
 	else
-	    echo "crun $* -f &"
-	    ./crun $* -f &
+	    echo "ceph-run $* -f &"
+	    ./ceph-run $* -f &
 	fi
     fi
 }
@@ -302,8 +302,8 @@ EOF
 			echo
 		fi
 
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mon. $keyring_fn
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --gen-key --name=client.admin --set-uid=0 \
+	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mon. $keyring_fn
+	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/ceph-authtool --gen-key --name=client.admin --set-uid=0 \
 		    --cap mon 'allow *' \
 		    --cap osd 'allow *' \
 		    --cap mds allow \
@@ -330,7 +330,7 @@ EOF
 
 		for f in $MONS
 		do
-		    cmd="$CEPH_BIN/cmon --mkfs -c $conf -i $f --monmap=$monmap_fn --osdmap=$osdmap_fn"
+		    cmd="$CEPH_BIN/ceph-mon --mkfs -c $conf -i $f --monmap=$monmap_fn --osdmap=$osdmap_fn"
 		    [ "$cephx" -eq 1 ] && cmd="$cmd --keyring=$keyring_fn"
 		    echo $cmd
 		    $cmd
@@ -343,7 +343,7 @@ EOF
 	if [ "$start_mon" -ne 0 ]; then
 		for f in $MONS
 		do
-		    run 'mon' $CEPH_BIN/cmon -i $f $ARGS $CMON_ARGS
+		    run 'mon' $CEPH_BIN/ceph-mon -i $f $ARGS $CMON_ARGS
 		done
 		sleep 1
 	fi
@@ -368,7 +368,7 @@ EOF
 EOF
 	    fi
 	    echo mkfs osd$osd
-	    cmd="$SUDO $CEPH_BIN/cosd -i $osd $ARGS --mkfs --mkkey"
+	    cmd="$SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS --mkfs --mkkey"
 	    echo $cmd
 	    $cmd
 
@@ -379,7 +379,7 @@ EOF
 	    fi
 	fi
 	echo start osd$osd
-	run 'osd' $SUDO $CEPH_BIN/cosd -i $osd $ARGS $COSD_ARGS
+	run 'osd' $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS $COSD_ARGS
     done
 fi
 
@@ -417,26 +417,26 @@ EOF
 EOF
 		fi
 	    fi
-	    $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mds.$name $key_fn
+	    $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mds.$name $key_fn
 	    $SUDO $CEPH_ADM -i $key_fn auth add mds.$name mon 'allow *' osd 'allow *' mds 'allow'
 	    if [ "$standby" -eq 1 ]; then
-		    $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mds.${name}s \
+		    $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mds.${name}s \
 			dev/mds.${name}s.keyring
                     $SUDO $CEPH_ADM -i dev/mds.${name}s.keyring auth add mds.${name}s \
 			mon 'allow *' osd 'allow *' mds 'allow'
 	    fi
 	fi
 	
-	run 'mds' $CEPH_BIN/cmds -i $name $ARGS $CMDS_ARGS
+	run 'mds' $CEPH_BIN/ceph-mds -i $name $ARGS $CMDS_ARGS
 	if [ "$standby" -eq 1 ]; then
-	    run 'mds' $CEPH_BIN/cmds -i ${name}s $ARGS $CMDS_ARGS
+	    run 'mds' $CEPH_BIN/ceph-mds -i ${name}s $ARGS $CMDS_ARGS
 	fi
 	
 	mds=$(($mds + 1))
 	[ $mds -eq $CEPH_NUM_MDS ] && break
 
-#valgrind --tool=massif $CEPH_BIN/cmds $ARGS --mds_log_max_segments 2 --mds_thrash_fragments 0 --mds_thrash_exports 0 > m  #--debug_ms 20
-#$CEPH_BIN/cmds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20
+#valgrind --tool=massif $CEPH_BIN/ceph-mds $ARGS --mds_log_max_segments 2 --mds_thrash_fragments 0 --mds_thrash_exports 0 > m  #--debug_ms 20
+#$CEPH_BIN/ceph-mds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20
 #$CEPH_ADM mds set_max_mds 2
     done
     cmd="$CEPH_ADM mds set_max_mds $CEPH_NUM_MDS"