diff --git a/tool/Makefile.am b/tool/Makefile.am
index dc9b76b6..0742a93a 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -45,8 +45,8 @@ ethercat_SOURCES = \
 	cmd_master.cpp \
 	cmd_pdos.cpp \
 	cmd_sdos.cpp \
-	cmd_sdo_download.cpp \
-	cmd_sdo_upload.cpp \
+	cmd_download.cpp \
+	cmd_upload.cpp \
 	cmd_slaves.cpp \
 	cmd_sii_read.cpp \
 	cmd_sii_write.cpp \
diff --git a/tool/cmd_sdo_download.cpp b/tool/cmd_download.cpp
similarity index 98%
rename from tool/cmd_sdo_download.cpp
rename to tool/cmd_download.cpp
index 1e606e5e..7bf0d014 100644
--- a/tool/cmd_sdo_download.cpp
+++ b/tool/cmd_download.cpp
@@ -14,7 +14,7 @@ using namespace std;
 /****************************************************************************/
 
 // FIXME
-const char *help_sdo_download =
+const char *help_download =
     "[OPTIONS]\n"
     "\n"
     "\n"
@@ -22,7 +22,7 @@ const char *help_sdo_download =
 
 /****************************************************************************/
 
-void command_sdo_download(void)
+void command_download(void)
 {
     stringstream strIndex, strSubIndex, strValue, err;
     ec_ioctl_slave_sdo_download_t data;
diff --git a/tool/cmd_sdo_upload.cpp b/tool/cmd_upload.cpp
similarity index 98%
rename from tool/cmd_sdo_upload.cpp
rename to tool/cmd_upload.cpp
index 4911c5a1..bfbc0815 100644
--- a/tool/cmd_sdo_upload.cpp
+++ b/tool/cmd_upload.cpp
@@ -14,7 +14,7 @@ using namespace std;
 /****************************************************************************/
 
 // FIXME
-const char *help_sdo_upload =
+const char *help_upload =
     "[OPTIONS]\n"
     "\n"
     "\n"
@@ -22,7 +22,7 @@ const char *help_sdo_upload =
 
 /****************************************************************************/
 
-void command_sdo_upload(void)
+void command_upload(void)
 {
     stringstream strIndex, strSubIndex;
     int sval;
diff --git a/tool/main.cpp b/tool/main.cpp
index 16a65eae..13aaa062 100644
--- a/tool/main.cpp
+++ b/tool/main.cpp
@@ -61,8 +61,8 @@ DEFINE_EXTERN_COMMAND(domains);
 DEFINE_EXTERN_COMMAND(master);
 DEFINE_EXTERN_COMMAND(pdos);
 DEFINE_EXTERN_COMMAND(sdos);
-DEFINE_EXTERN_COMMAND(sdo_download);
-DEFINE_EXTERN_COMMAND(sdo_upload);
+DEFINE_EXTERN_COMMAND(download);
+DEFINE_EXTERN_COMMAND(upload);
 DEFINE_EXTERN_COMMAND(slaves);
 DEFINE_EXTERN_COMMAND(sii_read);
 DEFINE_EXTERN_COMMAND(sii_write);
@@ -78,8 +78,8 @@ static const Command commands[] = {
     INIT_COMMAND(master, "Show master information."),
     INIT_COMMAND(pdos, "List Pdo assignment/mapping."),
     INIT_COMMAND(sdos, "List Sdo dictionaries."),
-    INIT_COMMAND(sdo_download, "Write an Sdo entry."),
-    INIT_COMMAND(sdo_upload, "Read an Sdo entry."),
+    INIT_COMMAND(download, "Write an Sdo entry."),
+    INIT_COMMAND(upload, "Read an Sdo entry."),
     INIT_COMMAND(slaves, "Show slaves."),
     INIT_COMMAND(sii_read, "Output a slave's SII contents."),
     INIT_COMMAND(sii_write, "Write slave's SII contents."),
@@ -113,7 +113,7 @@ void printUsage()
     }
 
     cerr
-        << "Commands can be generously abbreviated." << endl
+        << "Commands can be abbreviated." << endl
 		<< "Global options:" << endl
         << "  --master  -m <master>  Index of the master to use. Default: 0"
 		<< endl
@@ -121,8 +121,6 @@ void printUsage()
         << endl
         << "                         or 'all' for all slaves (default)."
         << endl
-        << "                         or 'all' for all domains (default)."
-        << endl
         << "  --type    -t <type>    Forced Sdo data type." << endl
         << "  --force   -f           Force action." << endl
         << "  --quiet   -q           Output less information." << endl