Mercurial > irccd

changeset 255:233366c94ddb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: add suffixes to commands, closes #524
author David Demelier <markand@malikania.fr>
date Thu, 08 Sep 2016 13:11:10 +0200
parents 93a227277786
children f04acabfbbe5
files lib/irccd/cmd-help.cpp lib/irccd/cmd-help.hpp lib/irccd/cmd-plugin-config.cpp lib/irccd/cmd-plugin-config.hpp lib/irccd/cmd-plugin-info.cpp lib/irccd/cmd-plugin-info.hpp lib/irccd/cmd-plugin-list.cpp lib/irccd/cmd-plugin-list.hpp lib/irccd/cmd-plugin-load.cpp lib/irccd/cmd-plugin-load.hpp lib/irccd/cmd-plugin-reload.cpp lib/irccd/cmd-plugin-reload.hpp lib/irccd/cmd-plugin-unload.cpp lib/irccd/cmd-plugin-unload.hpp lib/irccd/cmd-server-cmode.cpp lib/irccd/cmd-server-cmode.hpp lib/irccd/cmd-server-cnotice.cpp lib/irccd/cmd-server-cnotice.hpp lib/irccd/cmd-server-connect.cpp lib/irccd/cmd-server-connect.hpp lib/irccd/cmd-server-disconnect.cpp lib/irccd/cmd-server-disconnect.hpp lib/irccd/cmd-server-info.cpp lib/irccd/cmd-server-info.hpp lib/irccd/cmd-server-invite.cpp lib/irccd/cmd-server-invite.hpp lib/irccd/cmd-server-join.cpp lib/irccd/cmd-server-join.hpp lib/irccd/cmd-server-kick.cpp lib/irccd/cmd-server-kick.hpp lib/irccd/cmd-server-list.cpp lib/irccd/cmd-server-list.hpp lib/irccd/cmd-server-me.cpp lib/irccd/cmd-server-me.hpp lib/irccd/cmd-server-message.cpp lib/irccd/cmd-server-message.hpp lib/irccd/cmd-server-mode.cpp lib/irccd/cmd-server-mode.hpp lib/irccd/cmd-server-nick.cpp lib/irccd/cmd-server-nick.hpp lib/irccd/cmd-server-notice.cpp lib/irccd/cmd-server-notice.hpp lib/irccd/cmd-server-part.cpp lib/irccd/cmd-server-part.hpp lib/irccd/cmd-server-reconnect.cpp lib/irccd/cmd-server-reconnect.hpp lib/irccd/cmd-server-topic.cpp lib/irccd/cmd-server-topic.hpp lib/irccd/cmd-watch.cpp lib/irccd/cmd-watch.hpp lib/irccd/service-command.cpp
diffstat 51 files changed, 188 insertions(+), 211 deletions(-) [+]
line wrap: on
line diff
--- a/lib/irccd/cmd-help.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-help.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -24,17 +24,17 @@
 
 namespace command {
 
-Help::Help()
+HelpCommand::HelpCommand()
     : Command("help", "General", "Get help about a command")
 {
 }
 
-std::vector<Command::Arg> Help::args() const
+std::vector<Command::Arg> HelpCommand::args() const
 {
     return {{ "command", true }};
 }
 
-nlohmann::json Help::request(Irccdctl &irccdctl, const CommandRequest &args) const
+nlohmann::json HelpCommand::request(Irccdctl &irccdctl, const CommandRequest &args) const
 {
     auto it = irccdctl.commandService().find(args.arg(0U));
 
--- a/lib/irccd/cmd-help.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-help.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -34,12 +34,12 @@
  * \class Help
  * \brief Implementation of irccdctl help.
  */
-class Help : public Command {
+class HelpCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT Help();
+    IRCCD_EXPORT HelpCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-plugin-config.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-config.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -58,12 +58,12 @@
 
 } // !namespace
 
-PluginConfig::PluginConfig()
+PluginConfigCommand::PluginConfigCommand()
     : Command("plugin-config", "Plugins", "Get or set a plugin config variable")
 {
 }
 
-std::vector<Command::Arg> PluginConfig::args() const
+std::vector<Command::Arg> PluginConfigCommand::args() const
 {
     return {
         { "plugin",     true    },
@@ -72,12 +72,12 @@
     };
 }
 
-std::vector<Command::Property> PluginConfig::properties() const
+std::vector<Command::Property> PluginConfigCommand::properties() const
 {
     return {{ "plugin", { nlohmann::json::value_t::string }}};
 }
 
-nlohmann::json PluginConfig::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json PluginConfigCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     auto object = nlohmann::json::object({
         { "plugin", args.arg(0) }
@@ -93,7 +93,7 @@
     return object;
 }
 
-nlohmann::json PluginConfig::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json PluginConfigCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
@@ -110,7 +110,7 @@
     return execGet(irccd, request, var);
 }
 
-void PluginConfig::result(Irccdctl &irccdctl, const nlohmann::json &response) const
+void PluginConfigCommand::result(Irccdctl &irccdctl, const nlohmann::json &response) const
 {
     Command::result(irccdctl, response);
 
--- a/lib/irccd/cmd-plugin-config.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-config.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -33,12 +33,12 @@
 /**
  * \brief Implementation of plugin-config transport command.
  */
-class PluginConfig : public Command {
+class PluginConfigCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT PluginConfig();
+    IRCCD_EXPORT PluginConfigCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-plugin-info.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-info.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -28,27 +28,27 @@
 
 namespace command {
 
-PluginInfo::PluginInfo()
+PluginInfoCommand::PluginInfoCommand()
     : Command("plugin-info", "Plugins", "Get plugin information")
 {
 }
 
-std::vector<Command::Arg> PluginInfo::args() const
+std::vector<Command::Arg> PluginInfoCommand::args() const
 {
     return {{ "plugin", true }};
 }
 
-std::vector<Command::Property> PluginInfo::properties() const
+std::vector<Command::Property> PluginInfoCommand::properties() const
 {
     return {{ "plugin", { nlohmann::json::value_t::string }}};
 }
 
-nlohmann::json PluginInfo::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json PluginInfoCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({{ "plugin", args.arg(0) }});
 }
 
-nlohmann::json PluginInfo::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json PluginInfoCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
@@ -62,7 +62,7 @@
     });
 }
 
-void PluginInfo::result(Irccdctl &irccdctl, const nlohmann::json &result) const
+void PluginInfoCommand::result(Irccdctl &irccdctl, const nlohmann::json &result) const
 {
     Command::result(irccdctl, result);
 
--- a/lib/irccd/cmd-plugin-info.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-info.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class PluginInfo
  * \brief Implementation of plugin-info transport command.
  */
-class PluginInfo : public Command {
+class PluginInfoCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT PluginInfo();
+    IRCCD_EXPORT PluginInfoCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-plugin-list.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-list.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -28,12 +28,12 @@
 
 namespace command {
 
-PluginList::PluginList()
+PluginListCommand::PluginListCommand()
     : Command("plugin-list", "Plugins", "Get the list of loaded plugins")
 {
 }
 
-nlohmann::json PluginList::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json PluginListCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     auto response = Command::exec(irccd, request);
     auto list = nlohmann::json::array();
@@ -46,7 +46,7 @@
     return response;
 }
 
-void PluginList::result(Irccdctl &irccdctl, const nlohmann::json &object) const
+void PluginListCommand::result(Irccdctl &irccdctl, const nlohmann::json &object) const
 {
     Command::result(irccdctl, object);
 
--- a/lib/irccd/cmd-plugin-list.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-list.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class PluginList
  * \brief Implementation of plugin-list transport command.
  */
-class PluginList : public Command {
+class PluginListCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT PluginList();
+    IRCCD_EXPORT PluginListCommand();
 
     /**
      * \copydoc Command::exec
--- a/lib/irccd/cmd-plugin-load.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-load.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,22 +25,22 @@
 
 namespace command {
 
-PluginLoad::PluginLoad()
+PluginLoadCommand::PluginLoadCommand()
     : Command("plugin-load", "Plugins", "Load a plugin")
 {
 }
 
-std::vector<Command::Arg> PluginLoad::args() const
+std::vector<Command::Arg> PluginLoadCommand::args() const
 {
     return {{ "plugin", true }};
 }
 
-std::vector<Command::Property> PluginLoad::properties() const
+std::vector<Command::Property> PluginLoadCommand::properties() const
 {
     return {{ "plugin", { nlohmann::json::value_t::string }}};
 }
 
-nlohmann::json PluginLoad::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json PluginLoadCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-plugin-load.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-load.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class PluginLoad
  * \brief Implementation of plugin-load transport command.
  */
-class PluginLoad : public Command {
+class PluginLoadCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT PluginLoad();
+    IRCCD_EXPORT PluginLoadCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-plugin-reload.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-reload.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -26,22 +26,22 @@
 
 namespace command {
 
-PluginReload::PluginReload()
+PluginReloadCommand::PluginReloadCommand()
     : Command("plugin-reload", "Plugins", "Reload a plugin")
 {
 }
 
-std::vector<Command::Arg> PluginReload::args() const
+std::vector<Command::Arg> PluginReloadCommand::args() const
 {
     return {{ "plugin", true }};
 }
 
-std::vector<Command::Property> PluginReload::properties() const
+std::vector<Command::Property> PluginReloadCommand::properties() const
 {
     return {{ "plugin", { nlohmann::json::value_t::string }}};
 }
 
-nlohmann::json PluginReload::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json PluginReloadCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-plugin-reload.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-reload.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class PluginReload
  * \brief Implementation of plugin-reload transport command.
  */
-class PluginReload : public Command {
+class PluginReloadCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT PluginReload();
+    IRCCD_EXPORT PluginReloadCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-plugin-unload.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-unload.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,22 +25,22 @@
 
 namespace command {
 
-PluginUnload::PluginUnload()
+PluginUnloadCommand::PluginUnloadCommand()
     : Command("plugin-unload", "Plugins", "Unload a plugin")
 {
 }
 
-std::vector<Command::Arg> PluginUnload::args() const
+std::vector<Command::Arg> PluginUnloadCommand::args() const
 {
     return {{ "plugin", true }};
 }
 
-std::vector<Command::Property> PluginUnload::properties() const
+std::vector<Command::Property> PluginUnloadCommand::properties() const
 {
     return {{ "plugin", { nlohmann::json::value_t::string }}};
 }
 
-nlohmann::json PluginUnload::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json PluginUnloadCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-plugin-unload.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-plugin-unload.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class PluginUnload
  * \brief Implementation of plugin-unload transport command.
  */
-class PluginUnload : public Command {
+class PluginUnloadCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT PluginUnload();
+    IRCCD_EXPORT PluginUnloadCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-cmode.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-cmode.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerChannelMode::ServerChannelMode()
+ServerChannelModeCommand::ServerChannelModeCommand()
     : Command("server-cmode", "Server", "Change a channel mode")
 {
 }
 
-std::vector<Command::Arg> ServerChannelMode::args() const
+std::vector<Command::Arg> ServerChannelModeCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerChannelMode::properties() const
+std::vector<Command::Property> ServerChannelModeCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerChannelMode::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerChannelModeCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-cmode.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-cmode.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerChannelMode
  * \brief Implementation of server-cmode transport command.
  */
-class ServerChannelMode : public Command {
+class ServerChannelModeCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerChannelMode();
+    IRCCD_EXPORT ServerChannelModeCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-cnotice.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-cnotice.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerChannelNotice::ServerChannelNotice()
+ServerChannelNoticeCommand::ServerChannelNoticeCommand()
     : Command("server-cnotice", "Server", "Send a channel notice")
 {
 }
 
-std::vector<Command::Arg> ServerChannelNotice::args() const
+std::vector<Command::Arg> ServerChannelNoticeCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerChannelNotice::properties() const
+std::vector<Command::Property> ServerChannelNoticeCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerChannelNotice::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerChannelNoticeCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-cnotice.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-cnotice.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,7 +31,6 @@
 namespace command {
 
 /**
- * \class ServerChannelNotice
  * \brief Implementation of server-cnotice transport command.
  *
  * Send a channel notice to the specified channel.
@@ -43,12 +42,12 @@
  *   "message": "the message"
  * }
  */
-class ServerChannelNotice : public Command {
+class ServerChannelNoticeCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerChannelNotice();
+    IRCCD_EXPORT ServerChannelNoticeCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-connect.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-connect.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -34,12 +34,12 @@
 
 namespace command {
 
-ServerConnect::ServerConnect()
+ServerConnectCommand::ServerConnectCommand()
     : Command("server-connect", "Server", "Connect to a server")
 {
 }
 
-std::vector<Command::Option> ServerConnect::options() const
+std::vector<Command::Option> ServerConnectCommand::options() const
 {
     return {
         { "command",    "c", "command",     "char",     "command character to use"  },
@@ -51,7 +51,7 @@
     };
 }
 
-std::vector<Command::Arg> ServerConnect::args() const
+std::vector<Command::Arg> ServerConnectCommand::args() const
 {
     return {
         { "id",     true    },
@@ -60,7 +60,7 @@
     };
 }
 
-std::vector<Command::Property> ServerConnect::properties() const
+std::vector<Command::Property> ServerConnectCommand::properties() const
 {
     return {
         { "name",   { json::value_t::string }},
@@ -68,7 +68,7 @@
     };
 }
 
-json ServerConnect::exec(Irccd &irccd, const json &request) const
+json ServerConnectCommand::exec(Irccd &irccd, const json &request) const
 {
     auto server = Server::fromJson(request);
 
--- a/lib/irccd/cmd-server-connect.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-connect.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerConnect
  * \brief Implementation of server-connect transport command.
  */
-class ServerConnect : public Command {
+class ServerConnectCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerConnect();
+    IRCCD_EXPORT ServerConnectCommand();
 
     /**
      * \copydoc Command::options
--- a/lib/irccd/cmd-server-disconnect.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-disconnect.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,17 +25,17 @@
 
 namespace command {
 
-ServerDisconnect::ServerDisconnect()
+ServerDisconnectCommand::ServerDisconnectCommand()
     : Command("server-disconnect", "Server", "Disconnect one or more servers")
 {
 }
 
-std::vector<Command::Arg> ServerDisconnect::args() const
+std::vector<Command::Arg> ServerDisconnectCommand::args() const
 {
     return {{ "server", false }};
 }
 
-nlohmann::json ServerDisconnect::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerDisconnectCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     auto it = request.find("server");
 
--- a/lib/irccd/cmd-server-disconnect.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-disconnect.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerDisconnect
  * \brief Implementation of server-disconnect transport command.
  */
-class ServerDisconnect : public Command {
+class ServerDisconnectCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerDisconnect();
+    IRCCD_EXPORT ServerDisconnectCommand();
 
     /**
      * Get list of arguments required.
--- a/lib/irccd/cmd-server-info.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-info.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -27,27 +27,27 @@
 
 namespace command {
 
-ServerInfo::ServerInfo()
+ServerInfoCommand::ServerInfoCommand()
     : Command("server-info", "Server", "Get server information")
 {
 }
 
-std::vector<Command::Arg> ServerInfo::args() const
+std::vector<Command::Arg> ServerInfoCommand::args() const
 {
     return {{ "server", true }};
 }
 
-std::vector<Command::Property> ServerInfo::properties() const
+std::vector<Command::Property> ServerInfoCommand::properties() const
 {
     return {{ "server", { nlohmann::json::value_t::string }}};
 }
 
-nlohmann::json ServerInfo::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerInfoCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return {{ "server", args.args()[0] }};
 }
 
-nlohmann::json ServerInfo::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerInfoCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     auto response = Command::exec(irccd, request);
     auto server = irccd.servers().require(request["server"]);
@@ -72,7 +72,7 @@
     return response;
 }
 
-void ServerInfo::result(Irccdctl &irccdctl, const nlohmann::json &response) const
+void ServerInfoCommand::result(Irccdctl &irccdctl, const nlohmann::json &response) const
 {
     Command::result(irccdctl, response);
 
--- a/lib/irccd/cmd-server-info.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-info.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerInfo
  * \brief Implementation of server-info transport command.
  */
-class ServerInfo : public Command {
+class ServerInfoCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerInfo();
+    IRCCD_EXPORT ServerInfoCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-invite.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-invite.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerInvite::ServerInvite()
+ServerInviteCommand::ServerInviteCommand()
     : Command("server-invite", "Server", "Invite someone into a channel")
 {
 }
 
-std::vector<Command::Arg> ServerInvite::args() const
+std::vector<Command::Arg> ServerInviteCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerInvite::properties() const
+std::vector<Command::Property> ServerInviteCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerInvite::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerInviteCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.args()[0] },
@@ -57,7 +57,7 @@
     });
 }
 
-nlohmann::json ServerInvite::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerInviteCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-invite.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-invite.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerInvite
  * \brief Implementation of server-invite transport command.
  */
-class ServerInvite : public Command {
+class ServerInviteCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerInvite();
+    IRCCD_EXPORT ServerInviteCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-join.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-join.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerJoin::ServerJoin()
+ServerJoinCommand::ServerJoinCommand()
     : Command("server-join", "Server", "Join a channel")
 {
 }
 
-std::vector<Command::Arg> ServerJoin::args() const
+std::vector<Command::Arg> ServerJoinCommand::args() const
 {
     return {
         { "server",     true    },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerJoin::properties() const
+std::vector<Command::Property> ServerJoinCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -47,7 +47,7 @@
     };
 }
 
-nlohmann::json ServerJoin::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerJoinCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     auto req = nlohmann::json::object({
         { "server",     args.args()[0] },
@@ -60,7 +60,7 @@
     return req;
 }
 
-nlohmann::json ServerJoin::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerJoinCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-join.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-join.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerJoin
  * \brief Implementation of server-join transport command.
  */
-class ServerJoin : public Command {
+class ServerJoinCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerJoin();
+    IRCCD_EXPORT ServerJoinCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-kick.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-kick.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerKick::ServerKick()
+ServerKickCommand::ServerKickCommand()
     : Command("server-kick", "Server", "Kick someone from a channel")
 {
 }
 
-std::vector<Command::Arg> ServerKick::args() const
+std::vector<Command::Arg> ServerKickCommand::args() const
 {
     return {
         { "server",     true    },
@@ -40,7 +40,7 @@
     };
 }
 
-std::vector<Command::Property> ServerKick::properties() const
+std::vector<Command::Property> ServerKickCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -49,7 +49,7 @@
     };
 }
 
-nlohmann::json ServerKick::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerKickCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     auto req = nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -63,7 +63,7 @@
     return req;
 }
 
-nlohmann::json ServerKick::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerKickCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-kick.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-kick.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerKick
  * \brief Implementation of server-kick transport command.
  */
-class ServerKick : public Command {
+class ServerKickCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerKick();
+    IRCCD_EXPORT ServerKickCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-list.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-list.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -27,12 +27,12 @@
 
 namespace command {
 
-ServerList::ServerList()
+ServerListCommand::ServerListCommand()
     : Command("server-list", "Server", "Get the list of servers")
 {
 }
 
-nlohmann::json ServerList::exec(Irccd &irccd, const nlohmann::json &) const
+nlohmann::json ServerListCommand::exec(Irccd &irccd, const nlohmann::json &) const
 {
     auto json = nlohmann::json::object();
     auto list = nlohmann::json::array();
@@ -45,7 +45,7 @@
     return json;
 }
 
-void ServerList::result(Irccdctl &, const nlohmann::json &response) const
+void ServerListCommand::result(Irccdctl &, const nlohmann::json &response) const
 {
     auto list = response.find("list");
 
--- a/lib/irccd/cmd-server-list.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-list.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerList
  * \brief Implementation of server-list transport command.
  */
-class ServerList : public Command {
+class ServerListCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerList();
+    IRCCD_EXPORT ServerListCommand();
 
     /**
      * \copydoc Command::exec
--- a/lib/irccd/cmd-server-me.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-me.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerMe::ServerMe()
+ServerMeCommand::ServerMeCommand()
     : Command("server-me", "Server", "Send an action emote")
 {
 }
 
-std::vector<Command::Arg> ServerMe::args() const
+std::vector<Command::Arg> ServerMeCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerMe::properties() const
+std::vector<Command::Property> ServerMeCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerMe::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerMeCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -57,7 +57,7 @@
     });
 }
 
-nlohmann::json ServerMe::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerMeCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-me.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-me.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerMe
  * \brief Implementation of server-me transport command.
  */
-class ServerMe : public Command {
+class ServerMeCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerMe();
+    IRCCD_EXPORT ServerMeCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-message.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-message.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerMessage::ServerMessage()
+ServerMessageCommand::ServerMessageCommand()
     : Command("server-message", "Server", "Send a message")
 {
 }
 
-std::vector<Command::Arg> ServerMessage::args() const
+std::vector<Command::Arg> ServerMessageCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerMessage::properties() const
+std::vector<Command::Property> ServerMessageCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerMessage::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerMessageCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -57,7 +57,7 @@
     });
 }
 
-nlohmann::json ServerMessage::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerMessageCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-message.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-message.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerMessage
  * \brief Implementation of server-message transport command.
  */
-class ServerMessage : public Command {
+class ServerMessageCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerMessage();
+    IRCCD_EXPORT ServerMessageCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-mode.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-mode.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerMode::ServerMode()
+ServerModeCommand::ServerModeCommand()
     : Command("server-mode", "Server", "Change your mode")
 {
 }
 
-std::vector<Command::Arg> ServerMode::args() const
+std::vector<Command::Arg> ServerModeCommand::args() const
 {
     return {
         { "server",     true },
@@ -38,7 +38,7 @@
     };
 }
 
-std::vector<Command::Property> ServerMode::properties() const
+std::vector<Command::Property> ServerModeCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -46,7 +46,7 @@
     };
 }
 
-nlohmann::json ServerMode::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerModeCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -54,7 +54,7 @@
     });
 }
 
-nlohmann::json ServerMode::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerModeCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-mode.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-mode.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerMode
  * \brief Implementation of server-mode transport command.
  */
-class ServerMode : public Command {
+class ServerModeCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerMode();
+    IRCCD_EXPORT ServerModeCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-nick.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-nick.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerNick::ServerNick()
+ServerNickCommand::ServerNickCommand()
     : Command("server-nick", "Server", "Change your nickname")
 {
 }
 
-std::vector<Command::Arg> ServerNick::args() const
+std::vector<Command::Arg> ServerNickCommand::args() const
 {
     return {
         { "server",     true },
@@ -38,7 +38,7 @@
     };
 }
 
-std::vector<Command::Property> ServerNick::properties() const
+std::vector<Command::Property> ServerNickCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -46,7 +46,7 @@
     };
 }
 
-nlohmann::json ServerNick::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerNickCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -54,7 +54,7 @@
     });
 }
 
-nlohmann::json ServerNick::exec(Irccd &irccd, const nlohmann::json &object) const
+nlohmann::json ServerNickCommand::exec(Irccd &irccd, const nlohmann::json &object) const
 {
     Command::exec(irccd, object);
 
--- a/lib/irccd/cmd-server-nick.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-nick.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerNick
  * \brief Implementation of server-nick transport command.
  */
-class ServerNick : public Command {
+class ServerNickCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerNick();
+    IRCCD_EXPORT ServerNickCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-notice.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-notice.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerNotice::ServerNotice()
+ServerNoticeCommand::ServerNoticeCommand()
     : Command("server-notice", "Server", "Send a private notice")
 {
 }
 
-std::vector<Command::Arg> ServerNotice::args() const
+std::vector<Command::Arg> ServerNoticeCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerNotice::properties() const
+std::vector<Command::Property> ServerNoticeCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerNotice::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerNoticeCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -57,7 +57,7 @@
     });
 }
 
-nlohmann::json ServerNotice::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerNoticeCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-notice.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-notice.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerNotice
  * \brief Implementation of server-notice transport command.
  */
-class ServerNotice : public Command {
+class ServerNoticeCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerNotice();
+    IRCCD_EXPORT ServerNoticeCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-part.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-part.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerPart::ServerPart()
+ServerPartCommand::ServerPartCommand()
     : Command("server-part", "Server", "Leave a channel")
 {
 }
 
-std::vector<Command::Arg> ServerPart::args() const
+std::vector<Command::Arg> ServerPartCommand::args() const
 {
     return {
         { "server",     true    },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerPart::properties() const
+std::vector<Command::Property> ServerPartCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -47,7 +47,7 @@
     };
 }
 
-nlohmann::json ServerPart::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerPartCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     auto req = nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -60,7 +60,7 @@
     return req;
 }
 
-nlohmann::json ServerPart::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerPartCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-part.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-part.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -34,12 +34,12 @@
  * \class ServerPart
  * \brief Implementation of server-part transport command.
  */
-class ServerPart : public Command {
+class ServerPartCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerPart();
+    IRCCD_EXPORT ServerPartCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-reconnect.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-reconnect.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,22 +25,22 @@
 
 namespace command {
 
-ServerReconnect::ServerReconnect()
+ServerReconnectCommand::ServerReconnectCommand()
     : Command("server-reconnect", "Server", "Force reconnection of one or more servers")
 {
 }
 
-std::vector<Command::Arg> ServerReconnect::args() const
+std::vector<Command::Arg> ServerReconnectCommand::args() const
 {
     return {{ "server", false }};
 }
 
-nlohmann::json ServerReconnect::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerReconnectCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return args.length() == 0 ? nlohmann::json::object() : nlohmann::json::object({ { "server", args.arg(0) } });
 }
 
-nlohmann::json ServerReconnect::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerReconnectCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     auto server = request.find("server");
 
--- a/lib/irccd/cmd-server-reconnect.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-reconnect.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerReconnect
  * \brief Implementation of server-reconnect transport command.
  */
-class ServerReconnect : public Command {
+class ServerReconnectCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerReconnect();
+    IRCCD_EXPORT ServerReconnectCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-server-topic.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-topic.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -25,12 +25,12 @@
 
 namespace command {
 
-ServerTopic::ServerTopic()
+ServerTopicCommand::ServerTopicCommand()
     : Command("server-topic", "Server", "Change a channel topic")
 {
 }
 
-std::vector<Command::Arg> ServerTopic::args() const
+std::vector<Command::Arg> ServerTopicCommand::args() const
 {
     return {
         { "server",     true },
@@ -39,7 +39,7 @@
     };
 }
 
-std::vector<Command::Property> ServerTopic::properties() const
+std::vector<Command::Property> ServerTopicCommand::properties() const
 {
     return {
         { "server",     { nlohmann::json::value_t::string }},
@@ -48,7 +48,7 @@
     };
 }
 
-nlohmann::json ServerTopic::request(Irccdctl &, const CommandRequest &args) const
+nlohmann::json ServerTopicCommand::request(Irccdctl &, const CommandRequest &args) const
 {
     return nlohmann::json::object({
         { "server",     args.arg(0) },
@@ -57,7 +57,7 @@
     });
 }
 
-nlohmann::json ServerTopic::exec(Irccd &irccd, const nlohmann::json &request) const
+nlohmann::json ServerTopicCommand::exec(Irccd &irccd, const nlohmann::json &request) const
 {
     Command::exec(irccd, request);
 
--- a/lib/irccd/cmd-server-topic.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-server-topic.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class ServerTopic
  * \brief Implementation of server-topic transport command.
  */
-class ServerTopic : public Command {
+class ServerTopicCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT ServerTopic();
+    IRCCD_EXPORT ServerTopicCommand();
 
     /**
      * \copydoc Command::args
--- a/lib/irccd/cmd-watch.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-watch.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -197,18 +197,17 @@
 
 } // !namespace
 
-Watch::Watch()
-    : Command(
-        "watch", "General", "Start watching irccd events")
+WatchCommand::WatchCommand()
+    : Command("watch", "General", "Start watching irccd events")
 {
 }
 
-std::vector<Command::Option> Watch::options() const
+std::vector<Command::Option> WatchCommand::options() const
 {
     return {{ "format", "f", "format", "format", "output format" }};
 }
 
-nlohmann::json Watch::request(Irccdctl &ctl, const CommandRequest &request) const
+nlohmann::json WatchCommand::request(Irccdctl &ctl, const CommandRequest &request) const
 {
     std::string format = request.optionOr("format", "native");
 
--- a/lib/irccd/cmd-watch.hpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/cmd-watch.hpp	Thu Sep 08 13:11:10 2016 +0200
@@ -31,15 +31,14 @@
 namespace command {
 
 /**
- * \class Watch
  * \brief Implementation of irccdctl watch.
  */
-class Watch : public Command {
+class WatchCommand : public Command {
 public:
     /**
      * Constructor.
      */
-    IRCCD_EXPORT Watch();
+    IRCCD_EXPORT WatchCommand();
 
     /**
      * \copydoc Command::options
--- a/lib/irccd/service-command.cpp	Mon Sep 05 12:53:13 2016 +0200
+++ b/lib/irccd/service-command.cpp	Thu Sep 08 13:11:10 2016 +0200
@@ -49,31 +49,31 @@
 
 CommandService::CommandService()
     : m_commands{
-        std::make_shared<command::Help>(),
-        std::make_shared<command::PluginConfig>(),
-        std::make_shared<command::PluginInfo>(),
-        std::make_shared<command::PluginList>(),
-        std::make_shared<command::PluginLoad>(),
-        std::make_shared<command::PluginReload>(),
-        std::make_shared<command::PluginUnload>(),
-        std::make_shared<command::ServerChannelMode>(),
-        std::make_shared<command::ServerChannelNotice>(),
-        std::make_shared<command::ServerConnect>(),
-        std::make_shared<command::ServerDisconnect>(),
-        std::make_shared<command::ServerInfo>(),
-        std::make_shared<command::ServerInvite>(),
-        std::make_shared<command::ServerJoin>(),
-        std::make_shared<command::ServerKick>(),
-        std::make_shared<command::ServerList>(),
-        std::make_shared<command::ServerMe>(),
-        std::make_shared<command::ServerMessage>(),
-        std::make_shared<command::ServerMode>(),
-        std::make_shared<command::ServerNick>(),
-        std::make_shared<command::ServerNotice>(),
-        std::make_shared<command::ServerPart>(),
-        std::make_shared<command::ServerReconnect>(),
-        std::make_shared<command::ServerTopic>(),
-        std::make_shared<command::Watch>(),
+        std::make_shared<command::HelpCommand>(),
+        std::make_shared<command::PluginConfigCommand>(),
+        std::make_shared<command::PluginInfoCommand>(),
+        std::make_shared<command::PluginListCommand>(),
+        std::make_shared<command::PluginLoadCommand>(),
+        std::make_shared<command::PluginReloadCommand>(),
+        std::make_shared<command::PluginUnloadCommand>(),
+        std::make_shared<command::ServerChannelModeCommand>(),
+        std::make_shared<command::ServerChannelNoticeCommand>(),
+        std::make_shared<command::ServerConnectCommand>(),
+        std::make_shared<command::ServerDisconnectCommand>(),
+        std::make_shared<command::ServerInfoCommand>(),
+        std::make_shared<command::ServerInviteCommand>(),
+        std::make_shared<command::ServerJoinCommand>(),
+        std::make_shared<command::ServerKickCommand>(),
+        std::make_shared<command::ServerListCommand>(),
+        std::make_shared<command::ServerMeCommand>(),
+        std::make_shared<command::ServerMessageCommand>(),
+        std::make_shared<command::ServerModeCommand>(),
+        std::make_shared<command::ServerNickCommand>(),
+        std::make_shared<command::ServerNoticeCommand>(),
+        std::make_shared<command::ServerPartCommand>(),
+        std::make_shared<command::ServerReconnectCommand>(),
+        std::make_shared<command::ServerTopicCommand>(),
+        std::make_shared<command::WatchCommand>(),
     }
 {
 }