diff --git a/src/command_events.cc b/src/command_events.cc
index 0c8bdc5a..74e02a50 100644
--- a/src/command_events.cc
+++ b/src/command_events.cc
@@ -328,18 +328,28 @@ initialize_command_events() {
   CMD2_ANY_STRING_V("import",          std::tr1::bind(&apply_import, std::tr1::placeholders::_2));
   CMD2_ANY_STRING_V("try_import",      std::tr1::bind(&apply_try_import, std::tr1::placeholders::_2));
 
-  CMD2_ANY_LIST    ("load",            std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_tied));
-  CMD2_ANY_LIST    ("load_verbose",    std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_tied));
-  CMD2_ANY_LIST    ("load_start",      std::tr1::bind(&apply_load, std::tr1::placeholders::_2,
-                                                      core::Manager::create_quiet | core::Manager::create_tied | core::Manager::create_start));
-  CMD2_ANY_LIST    ("load_start_verbose", std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_tied  | core::Manager::create_start));
-  CMD2_ANY_LIST    ("load_raw",           std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_raw_data));
-  CMD2_ANY_LIST    ("load_raw_verbose",   std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_raw_data));
-  CMD2_ANY_LIST    ("load_raw_start",     std::tr1::bind(&apply_load, std::tr1::placeholders::_2,
+  // CMD2_ANY_LIST    ("load",            std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_tied));
+  // CMD2_ANY_LIST    ("load_verbose",    std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_tied));
+  // CMD2_ANY_LIST    ("load_start",      std::tr1::bind(&apply_load, std::tr1::placeholders::_2,
+  //                                                     core::Manager::create_quiet | core::Manager::create_tied | core::Manager::create_start));
+  // CMD2_ANY_LIST    ("load_start_verbose", std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_tied  | core::Manager::create_start));
+  // CMD2_ANY_LIST    ("load_raw",           std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_raw_data));
+  // CMD2_ANY_LIST    ("load_raw_verbose",   std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_raw_data));
+  // CMD2_ANY_LIST    ("load_raw_start",     std::tr1::bind(&apply_load, std::tr1::placeholders::_2,
+  //                                                        core::Manager::create_quiet | core::Manager::create_start | core::Manager::create_raw_data));
+
+  CMD2_ANY_LIST    ("load.normal",        std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_tied));
+  CMD2_ANY_LIST    ("load.verbose",       std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_tied));
+  CMD2_ANY_LIST    ("load.start",         std::tr1::bind(&apply_load, std::tr1::placeholders::_2,
+                                                         core::Manager::create_quiet | core::Manager::create_tied | core::Manager::create_start));
+  CMD2_ANY_LIST    ("load.start_verbose", std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_tied  | core::Manager::create_start));
+  CMD2_ANY_LIST    ("load.raw",           std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_raw_data));
+  CMD2_ANY_LIST    ("load.raw_verbose",   std::tr1::bind(&apply_load, std::tr1::placeholders::_2, core::Manager::create_raw_data));
+  CMD2_ANY_LIST    ("load.raw_start",     std::tr1::bind(&apply_load, std::tr1::placeholders::_2,
                                                          core::Manager::create_quiet | core::Manager::create_start | core::Manager::create_raw_data));
 
   CMD2_ANY_VALUE   ("close_low_diskspace", std::tr1::bind(&apply_close_low_diskspace, std::tr1::placeholders::_2));
 
   CMD2_ANY_LIST    ("download_list",       std::tr1::bind(&apply_download_list, std::tr1::placeholders::_2));
-  CMD2_ANY_LIST    ("d.multicall2",         std::tr1::bind(&d_multicall, std::tr1::placeholders::_2));
+  CMD2_ANY_LIST    ("d.multicall2",        std::tr1::bind(&d_multicall, std::tr1::placeholders::_2));
 }
diff --git a/src/main.cc b/src/main.cc
index 129747e3..ba6ffaec 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -385,6 +385,15 @@ main(int argc, char** argv) {
 
       CMD2_REDIRECT        ("key_layout", "keys.layout.set");
 
+      CMD2_REDIRECT_GENERIC("load", "load.normal");
+      CMD2_REDIRECT_GENERIC("load_verbose", "load.verbose");
+      CMD2_REDIRECT_GENERIC("load_start", "load.start");
+      CMD2_REDIRECT_GENERIC("load_start_verbose", "load.start_verbose");
+
+      CMD2_REDIRECT_GENERIC("load_raw", "load.raw");
+      CMD2_REDIRECT_GENERIC("load_raw_start", "load.raw_start");
+      CMD2_REDIRECT_GENERIC("load_raw_verbose", "load.raw_verbose");
+
       //
       // Throttle:
       //