# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1465473055 -7200
# Node ID c26754e419c499c01f076addc330ed799b3b91e9
# Parent  786559f1937f7db5a27cbbc5d86ffe4019e1ee08
Irccd: rename RemoteCommand to Command

diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-help.cpp
--- a/lib/irccd/cmd-help.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-help.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -25,11 +25,11 @@
 namespace command {
 
 Help::Help()
-	: RemoteCommand("help", "General")
+	: Command("help", "General")
 {
 }
 
-std::vector<RemoteCommand::Arg> Help::args() const
+std::vector<Command::Arg> Help::args() const
 {
 	return {{ "command", true }};
 }
@@ -39,7 +39,7 @@
 	return "Get help about a command.";
 }
 
-json::Value Help::request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const
+json::Value Help::request(Irccdctl &irccdctl, const CommandRequest &args) const
 {
 	auto it = irccdctl.commandService().find(args.arg(0U));
 
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-help.hpp
--- a/lib/irccd/cmd-help.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-help.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class Help
  * \brief Implementation of irccdctl help.
  */
-class Help : public RemoteCommand {
+class Help : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,19 +42,19 @@
 	IRCCD_EXPORT Help();
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 };
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-config.cpp
--- a/lib/irccd/cmd-plugin-config.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-config.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -60,7 +60,7 @@
 } // !namespace
 
 PluginConfig::PluginConfig()
-	: RemoteCommand("plugin-config", "Plugins")
+	: Command("plugin-config", "Plugins")
 {
 }
 
@@ -69,7 +69,7 @@
 	return "Get or set a plugin configuration option.";
 }
 
-std::vector<RemoteCommand::Arg> PluginConfig::args() const
+std::vector<Command::Arg> PluginConfig::args() const
 {
 	return {
 		{ "plugin",	true	},
@@ -78,7 +78,7 @@
 	};
 }
 
-json::Value PluginConfig::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value PluginConfig::request(Irccdctl &, const CommandRequest &args) const
 {
 	auto object = json::object({
 		{ "plugin", args.arg(0) }
@@ -101,7 +101,7 @@
 
 void PluginConfig::result(Irccdctl &irccdctl, const json::Value &response) const
 {
-	RemoteCommand::result(irccdctl, response);
+	Command::result(irccdctl, response);
 
 	auto it = response.find("vars");
 
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-config.hpp
--- a/lib/irccd/cmd-plugin-config.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-config.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -33,7 +33,7 @@
 /**
  * \brief Implementation of plugin-config transport command.
  */
-class PluginConfig : public RemoteCommand {
+class PluginConfig : public Command {
 public:
 	/**
 	 * Constructor.
@@ -41,27 +41,27 @@
 	IRCCD_EXPORT PluginConfig();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 
 	/**
-	 * \copydoc RemoteCommand::result
+	 * \copydoc Command::result
 	 */
 	IRCCD_EXPORT void result(Irccdctl &irccdctl, const json::Value &response) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-info.cpp
--- a/lib/irccd/cmd-plugin-info.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-info.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -29,7 +29,7 @@
 namespace command {
 
 PluginInfo::PluginInfo()
-	: RemoteCommand("plugin-info", "Plugins")
+	: Command("plugin-info", "Plugins")
 {
 }
 
@@ -38,12 +38,12 @@
 	return "Get plugin information.";
 }
 
-std::vector<RemoteCommand::Arg> PluginInfo::args() const
+std::vector<Command::Arg> PluginInfo::args() const
 {
 	return {{ "plugin", true }};
 }
 
-json::Value PluginInfo::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value PluginInfo::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({{ "plugin", args.arg(0) }});
 }
@@ -62,7 +62,7 @@
 
 void PluginInfo::result(Irccdctl &irccdctl, const json::Value &result) const
 {
-	RemoteCommand::result(irccdctl, result);
+	Command::result(irccdctl, result);
 
 	// Plugin information.
 	if (result.valueOr("status", false).toBool()) {
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-info.hpp
--- a/lib/irccd/cmd-plugin-info.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-info.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class PluginInfo
  * \brief Implementation of plugin-info transport command.
  */
-class PluginInfo : public RemoteCommand {
+class PluginInfo : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,27 +42,27 @@
 	IRCCD_EXPORT PluginInfo();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 
 	/**
-	 * \copydoc RemoteCommand::result
+	 * \copydoc Command::result
 	 */
 	IRCCD_EXPORT void result(Irccdctl &irccdctl, const json::Value &response) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-list.cpp
--- a/lib/irccd/cmd-plugin-list.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-list.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -29,7 +29,7 @@
 namespace command {
 
 PluginList::PluginList()
-	: RemoteCommand("plugin-list", "Plugins")
+	: Command("plugin-list", "Plugins")
 {
 }
 
@@ -40,7 +40,7 @@
 
 json::Value PluginList::exec(Irccd &irccd, const json::Value &request) const
 {
-	json::Value response = RemoteCommand::exec(irccd, request);
+	json::Value response = Command::exec(irccd, request);
 	json::Value list = json::array({});
 
 	for (const auto &plugin : irccd.pluginService().plugins())
@@ -53,7 +53,7 @@
 
 void PluginList::result(Irccdctl &irccdctl, const json::Value &object) const
 {
-	RemoteCommand::result(irccdctl, object);
+	Command::result(irccdctl, object);
 
 	for (const auto &n : object.valueOr("list", json::Type::Array, json::array({})))
 		std::cout << n.toString() << std::endl;
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-list.hpp
--- a/lib/irccd/cmd-plugin-list.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-list.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class PluginList
  * \brief Implementation of plugin-list transport command.
  */
-class PluginList : public RemoteCommand {
+class PluginList : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@
 	IRCCD_EXPORT PluginList();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 
 	/**
-	 * \copydoc RemoteCommand::result
+	 * \copydoc Command::result
 	 */
 	IRCCD_EXPORT void result(Irccdctl &irccdctl, const json::Value &response) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-load.cpp
--- a/lib/irccd/cmd-plugin-load.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-load.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 PluginLoad::PluginLoad()
-	: RemoteCommand("plugin-load", "Plugins")
+	: Command("plugin-load", "Plugins")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "Load a plugin.";
 }
 
-std::vector<RemoteCommand::Arg> PluginLoad::args() const
+std::vector<Command::Arg> PluginLoad::args() const
 {
 	return {{ "plugin", true }};
 }
@@ -46,7 +46,7 @@
 
 	irccd.pluginService().load(name);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-load.hpp
--- a/lib/irccd/cmd-plugin-load.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-load.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class PluginLoad
  * \brief Implementation of plugin-load transport command.
  */
-class PluginLoad : public RemoteCommand {
+class PluginLoad : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@
 	IRCCD_EXPORT PluginLoad();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-reload.cpp
--- a/lib/irccd/cmd-plugin-reload.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-reload.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -27,7 +27,7 @@
 namespace command {
 
 PluginReload::PluginReload()
-	: RemoteCommand("plugin-reload", "Plugins")
+	: Command("plugin-reload", "Plugins")
 {
 }
 
@@ -36,7 +36,7 @@
 	return "Reload a plugin.";
 }
 
-std::vector<RemoteCommand::Arg> PluginReload::args() const
+std::vector<Command::Arg> PluginReload::args() const
 {
 	return {{ "plugin", true }};
 }
@@ -45,7 +45,7 @@
 {
 	irccd.pluginService().require(request.at("plugin").toString())->onReload(irccd);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-reload.hpp
--- a/lib/irccd/cmd-plugin-reload.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-reload.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class PluginReload
  * \brief Implementation of plugin-reload transport command.
  */
-class PluginReload : public RemoteCommand {
+class PluginReload : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@
 	IRCCD_EXPORT PluginReload();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-unload.cpp
--- a/lib/irccd/cmd-plugin-unload.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-unload.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 PluginUnload::PluginUnload()
-	: RemoteCommand("plugin-unload", "Plugins")
+	: Command("plugin-unload", "Plugins")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "Unload a plugin.";
 }
 
-std::vector<RemoteCommand::Arg> PluginUnload::args() const
+std::vector<Command::Arg> PluginUnload::args() const
 {
 	return {{ "plugin", true }};
 }
@@ -44,7 +44,7 @@
 {
 	irccd.pluginService().unload(request.at("plugin").toString());
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-plugin-unload.hpp
--- a/lib/irccd/cmd-plugin-unload.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-plugin-unload.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class PluginUnload
  * \brief Implementation of plugin-unload transport command.
  */
-class PluginUnload : public RemoteCommand {
+class PluginUnload : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@
 	IRCCD_EXPORT PluginUnload();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-cmode.cpp
--- a/lib/irccd/cmd-server-cmode.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-cmode.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerChannelMode::ServerChannelMode()
-	: RemoteCommand("server-cmode", "Server")
+	: Command("server-cmode", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerChannelMode::args() const
+std::vector<Command::Arg> ServerChannelMode::args() const
 {
 	return {
 		{ "server",	true },
@@ -51,7 +51,7 @@
 		request.at("mode").toString()
 	);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-cmode.hpp
--- a/lib/irccd/cmd-server-cmode.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-cmode.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerChannelMode
  * \brief Implementation of server-cmode transport command.
  */
-class ServerChannelMode : public RemoteCommand {
+class ServerChannelMode : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@
 	IRCCD_EXPORT ServerChannelMode();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 	 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-cnotice.cpp
--- a/lib/irccd/cmd-server-cnotice.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-cnotice.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerChannelNotice::ServerChannelNotice()
-	: RemoteCommand("server-cnotice", "Server")
+	: Command("server-cnotice", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerChannelNotice::args() const
+std::vector<Command::Arg> ServerChannelNotice::args() const
 {
 	return {
 		{ "server",	true },
@@ -51,7 +51,7 @@
 		request.at("message").toString()
 	);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-cnotice.hpp
--- a/lib/irccd/cmd-server-cnotice.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-cnotice.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -43,7 +43,7 @@
  *   "message": "the message"
  * }
  */
-class ServerChannelNotice : public RemoteCommand {
+class ServerChannelNotice : public Command {
 public:
 	/**
 	 * Constructor.
@@ -51,17 +51,17 @@
 	IRCCD_EXPORT ServerChannelNotice();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-connect.cpp
--- a/lib/irccd/cmd-server-connect.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-connect.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -116,7 +116,7 @@
 } // !namespace
 
 ServerConnect::ServerConnect()
-	: RemoteCommand("server-connect", "Server")
+	: Command("server-connect", "Server")
 {
 }
 
@@ -125,7 +125,7 @@
 	return "Connect to a server.";
 }
 
-std::vector<RemoteCommand::Option> ServerConnect::options() const
+std::vector<Command::Option> ServerConnect::options() const
 {
 	return {
 		{ "command",	"c", "command",		"char",		"command character to use"	},
@@ -137,7 +137,7 @@
 	};
 }
 
-std::vector<RemoteCommand::Arg> ServerConnect::args() const
+std::vector<Command::Arg> ServerConnect::args() const
 {
 	return {
 		{ "id",		true	},
@@ -155,7 +155,7 @@
 
 	irccd.serverService().add(std::move(server));
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-connect.hpp
--- a/lib/irccd/cmd-server-connect.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-connect.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerConnect
  * \brief Implementation of server-connect transport command.
  */
-class ServerConnect : public RemoteCommand {
+class ServerConnect : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerConnect();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::options
+	 * \copydoc Command::options
 	 */
 	IRCCD_EXPORT std::vector<Option> options() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-disconnect.cpp
--- a/lib/irccd/cmd-server-disconnect.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-disconnect.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerDisconnect::ServerDisconnect()
-	: RemoteCommand("server-disconnect", "Server")
+	: Command("server-disconnect", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerDisconnect::args() const
+std::vector<Command::Arg> ServerDisconnect::args() const
 {
 	return {{ "server", false }};
 }
@@ -49,7 +49,7 @@
 	else
 		irccd.serverService().remove(it->toString());
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-disconnect.hpp
--- a/lib/irccd/cmd-server-disconnect.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-disconnect.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerDisconnect
  * \brief Implementation of server-disconnect transport command.
  */
-class ServerDisconnect : public RemoteCommand {
+class ServerDisconnect : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,7 +42,7 @@
 	IRCCD_EXPORT ServerDisconnect();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
@@ -54,7 +54,7 @@
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-info.cpp
--- a/lib/irccd/cmd-server-info.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-info.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -28,7 +28,7 @@
 namespace command {
 
 ServerInfo::ServerInfo()
-	: RemoteCommand("server-info", "Server")
+	: Command("server-info", "Server")
 {
 }
 
@@ -37,12 +37,12 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerInfo::args() const
+std::vector<Command::Arg> ServerInfo::args() const
 {
 	return {{ "server", true }};
 }
 
-json::Value ServerInfo::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerInfo::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.args()[0] },
@@ -54,7 +54,7 @@
 json::Value ServerInfo::exec(Irccd &irccd, const json::Value &request) const
 {
 	auto server = irccd.serverService().require(request.at("server").toString());
-	auto response = RemoteCommand::exec(irccd, request);
+	auto response = Command::exec(irccd, request);
 
 	/* General stuff */
 	response.insert("name", server->name());
@@ -85,7 +85,7 @@
 
 void ServerInfo::result(Irccdctl &irccdctl, const json::Value &response) const
 {
-	RemoteCommand::result(irccdctl, response);
+	Command::result(irccdctl, response);
 
 	// Server information.
 	std::cout << std::boolalpha;
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-info.hpp
--- a/lib/irccd/cmd-server-info.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-info.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerInfo
  * \brief Implementation of server-info transport command.
  */
-class ServerInfo : public RemoteCommand {
+class ServerInfo : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,27 +42,27 @@
 	IRCCD_EXPORT ServerInfo();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 
 	/**
-	 * \copydoc RemoteCommand::result
+	 * \copydoc Command::result
 	 */
 	IRCCD_EXPORT void result(Irccdctl &irccdctl, const json::Value &response) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-invite.cpp
--- a/lib/irccd/cmd-server-invite.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-invite.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerInvite::ServerInvite()
-	: RemoteCommand("server-invite", "Server")
+	: Command("server-invite", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerInvite::args() const
+std::vector<Command::Arg> ServerInvite::args() const
 {
 	return {
 		{ "server",	true },
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerInvite::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerInvite::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.args()[0] },
@@ -61,7 +61,7 @@
 		request.at("channel").toString()
 	);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-invite.hpp
--- a/lib/irccd/cmd-server-invite.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-invite.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerInvite
  * \brief Implementation of server-invite transport command.
  */
-class ServerInvite : public RemoteCommand {
+class ServerInvite : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerInvite();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-join.cpp
--- a/lib/irccd/cmd-server-join.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-join.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerJoin::ServerJoin()
-	: RemoteCommand("server-join", "Server")
+	: Command("server-join", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerJoin::args() const
+std::vector<Command::Arg> ServerJoin::args() const
 {
 	return {
 		{ "server",	true	},
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerJoin::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerJoin::request(Irccdctl &, const CommandRequest &args) const
 {
 	auto req = json::object({
 		{ "server",	args.args()[0] },
@@ -65,7 +65,7 @@
 		request.valueOr("password", json::Type::String, "").toString()
 	);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-join.hpp
--- a/lib/irccd/cmd-server-join.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-join.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerJoin
  * \brief Implementation of server-join transport command.
  */
-class ServerJoin : public RemoteCommand {
+class ServerJoin : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerJoin();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-kick.cpp
--- a/lib/irccd/cmd-server-kick.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-kick.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerKick::ServerKick()
-	: RemoteCommand("server-kick", "Server")
+	: Command("server-kick", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerKick::args() const
+std::vector<Command::Arg> ServerKick::args() const
 {
 	return {
 		{ "server",	true	},
@@ -45,7 +45,7 @@
 	};
 }
 
-json::Value ServerKick::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerKick::request(Irccdctl &, const CommandRequest &args) const
 {
 	auto req = json::object({
 		{ "server",	args.arg(0) },
@@ -67,7 +67,7 @@
 		request.valueOr("reason", json::Type::String, "").toString()
 	);
 
-	return RemoteCommand::exec(irccd, request);
+	return Command::exec(irccd, request);
 }
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-kick.hpp
--- a/lib/irccd/cmd-server-kick.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-kick.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerKick
  * \brief Implementation of server-kick transport command.
  */
-class ServerKick : public RemoteCommand {
+class ServerKick : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerKick();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-list.cpp
--- a/lib/irccd/cmd-server-list.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-list.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -28,7 +28,7 @@
 namespace command {
 
 ServerList::ServerList()
-	: RemoteCommand("server-list", "Server")
+	: Command("server-list", "Server")
 {
 }
 
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-list.hpp
--- a/lib/irccd/cmd-server-list.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-list.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerList
  * \brief Implementation of server-list transport command.
  */
-class ServerList : public RemoteCommand {
+class ServerList : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@
 	IRCCD_EXPORT ServerList();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 
 	/**
-	 * \copydoc RemoteCommand::result
+	 * \copydoc Command::result
 	 */
 	IRCCD_EXPORT void result(Irccdctl &irccdctl, const json::Value &response) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-me.cpp
--- a/lib/irccd/cmd-server-me.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-me.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerMe::ServerMe()
-	: RemoteCommand("server-me", "Server")
+	: Command("server-me", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerMe::args() const
+std::vector<Command::Arg> ServerMe::args() const
 {
 	return {
 		{ "server",	true },
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerMe::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerMe::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-me.hpp
--- a/lib/irccd/cmd-server-me.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-me.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerMe
  * \brief Implementation of server-me transport command.
  */
-class ServerMe : public RemoteCommand {
+class ServerMe : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerMe();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-message.cpp
--- a/lib/irccd/cmd-server-message.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-message.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerMessage::ServerMessage()
-	: RemoteCommand("server-message", "Server")
+	: Command("server-message", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerMessage::args() const
+std::vector<Command::Arg> ServerMessage::args() const
 {
 	return {
 		{ "server",	true },
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerMessage::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerMessage::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-message.hpp
--- a/lib/irccd/cmd-server-message.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-message.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerMessage
  * \brief Implementation of server-message transport command.
  */
-class ServerMessage : public RemoteCommand {
+class ServerMessage : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerMessage();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-mode.cpp
--- a/lib/irccd/cmd-server-mode.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-mode.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerMode::ServerMode()
-	: RemoteCommand("server-mode", "Server")
+	: Command("server-mode", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerMode::args() const
+std::vector<Command::Arg> ServerMode::args() const
 {
 	return {
 		{ "server",	true },
@@ -43,7 +43,7 @@
 	};
 }
 
-json::Value ServerMode::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerMode::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-mode.hpp
--- a/lib/irccd/cmd-server-mode.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-mode.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerMode
  * \brief Implementation of server-mode transport command.
  */
-class ServerMode : public RemoteCommand {
+class ServerMode : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerMode();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-nick.cpp
--- a/lib/irccd/cmd-server-nick.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-nick.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerNick::ServerNick()
-	: RemoteCommand("server-nick", "Server")
+	: Command("server-nick", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerNick::args() const
+std::vector<Command::Arg> ServerNick::args() const
 {
 	return {
 		{ "server",	true },
@@ -43,7 +43,7 @@
 	};
 }
 
-json::Value ServerNick::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerNick::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-nick.hpp
--- a/lib/irccd/cmd-server-nick.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-nick.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerNick
  * \brief Implementation of server-nick transport command.
  */
-class ServerNick : public RemoteCommand {
+class ServerNick : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerNick();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-notice.cpp
--- a/lib/irccd/cmd-server-notice.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-notice.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerNotice::ServerNotice()
-	: RemoteCommand("server-notice", "Server")
+	: Command("server-notice", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerNotice::args() const
+std::vector<Command::Arg> ServerNotice::args() const
 {
 	return {
 		{ "server",	true },
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerNotice::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerNotice::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-notice.hpp
--- a/lib/irccd/cmd-server-notice.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-notice.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerNotice
  * \brief Implementation of server-notice transport command.
  */
-class ServerNotice : public RemoteCommand {
+class ServerNotice : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerNotice();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-part.cpp
--- a/lib/irccd/cmd-server-part.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-part.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerPart::ServerPart()
-	: RemoteCommand("server-part", "Server")
+	: Command("server-part", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerPart::args() const
+std::vector<Command::Arg> ServerPart::args() const
 {
 	return {
 		{ "server",	true	},
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerPart::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerPart::request(Irccdctl &, const CommandRequest &args) const
 {
 	auto req = json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-part.hpp
--- a/lib/irccd/cmd-server-part.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-part.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerPart
  * \brief Implementation of server-part transport command.
  */
-class ServerPart : public RemoteCommand {
+class ServerPart : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerPart();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-reconnect.cpp
--- a/lib/irccd/cmd-server-reconnect.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-reconnect.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerReconnect::ServerReconnect()
-	: RemoteCommand("server-reconnect", "Server")
+	: Command("server-reconnect", "Server")
 {
 }
 
@@ -35,12 +35,12 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerReconnect::args() const
+std::vector<Command::Arg> ServerReconnect::args() const
 {
 	return {{ "server", false }};
 }
 
-json::Value ServerReconnect::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerReconnect::request(Irccdctl &, const CommandRequest &args) const
 {
 	return args.length() == 0 ? nullptr : json::object({ { "server", args.arg(0) } });
 }
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-reconnect.hpp
--- a/lib/irccd/cmd-server-reconnect.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-reconnect.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerReconnect
  * \brief Implementation of server-reconnect transport command.
  */
-class ServerReconnect : public RemoteCommand {
+class ServerReconnect : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerReconnect();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-topic.cpp
--- a/lib/irccd/cmd-server-topic.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-topic.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -26,7 +26,7 @@
 namespace command {
 
 ServerTopic::ServerTopic()
-	: RemoteCommand("server-topic", "Server")
+	: Command("server-topic", "Server")
 {
 }
 
@@ -35,7 +35,7 @@
 	return "";
 }
 
-std::vector<RemoteCommand::Arg> ServerTopic::args() const
+std::vector<Command::Arg> ServerTopic::args() const
 {
 	return {
 		{ "server",	true },
@@ -44,7 +44,7 @@
 	};
 }
 
-json::Value ServerTopic::request(Irccdctl &, const RemoteCommandRequest &args) const
+json::Value ServerTopic::request(Irccdctl &, const CommandRequest &args) const
 {
 	return json::object({
 		{ "server",	args.arg(0) },
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-server-topic.hpp
--- a/lib/irccd/cmd-server-topic.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-server-topic.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class ServerTopic
  * \brief Implementation of server-topic transport command.
  */
-class ServerTopic : public RemoteCommand {
+class ServerTopic : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,22 +42,22 @@
 	IRCCD_EXPORT ServerTopic();
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::args
+	 * \copydoc Command::args
 	 */
 	IRCCD_EXPORT std::vector<Arg> args() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 
 	/**
-	 * \copydoc RemoteCommand::exec
+	 * \copydoc Command::exec
 	 */
 	IRCCD_EXPORT json::Value exec(Irccd &irccd, const json::Value &request) const override;
 };
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-watch.cpp
--- a/lib/irccd/cmd-watch.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-watch.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -188,11 +188,11 @@
 } // !namespace
 
 Watch::Watch()
-	: RemoteCommand("watch", "General")
+	: Command("watch", "General")
 {
 }
 
-std::vector<RemoteCommand::Option> Watch::options() const
+std::vector<Command::Option> Watch::options() const
 {
 	return {{ "format", "f", "format", "format", "output format" }};
 }
@@ -208,7 +208,7 @@
 	return oss.str();
 }
 
-json::Value Watch::request(Irccdctl &ctl, const RemoteCommandRequest &request) const
+json::Value Watch::request(Irccdctl &ctl, const CommandRequest &request) const
 {
 	std::string format = request.optionOr("format", "native");
 
diff -r 786559f1937f -r c26754e419c4 lib/irccd/cmd-watch.hpp
--- a/lib/irccd/cmd-watch.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/cmd-watch.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -34,7 +34,7 @@
  * \class Watch
  * \brief Implementation of irccdctl watch.
  */
-class Watch : public RemoteCommand {
+class Watch : public Command {
 public:
 	/**
 	 * Constructor.
@@ -42,19 +42,19 @@
 	IRCCD_EXPORT Watch();
 
 	/**
-	 * \copydoc RemoteCommand::options
+	 * \copydoc Command::options
 	 */
 	IRCCD_EXPORT std::vector<Option> options() const override;
 
 	/**
-	 * \copydoc RemoteCommand::help
+	 * \copydoc Command::help
 	 */
 	IRCCD_EXPORT std::string help() const override;
 
 	/**
-	 * \copydoc RemoteCommand::request
+	 * \copydoc Command::request
 	 */
-	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const override;
+	IRCCD_EXPORT json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const override;
 };
 
 } // !command
diff -r 786559f1937f -r c26754e419c4 lib/irccd/command.cpp
--- a/lib/irccd/command.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/command.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -28,7 +28,7 @@
 
 namespace irccd {
 
-std::string RemoteCommand::usage() const
+std::string Command::usage() const
 {
 	std::ostringstream oss;
 
@@ -71,7 +71,7 @@
 	return oss.str();
 }
 
-unsigned RemoteCommand::min() const noexcept
+unsigned Command::min() const noexcept
 {
 	auto list = args();
 
@@ -80,22 +80,22 @@
 	});
 }
 
-unsigned RemoteCommand::max() const noexcept
+unsigned Command::max() const noexcept
 {
 	return (unsigned)args().size();
 }
 
-json::Value RemoteCommand::request(Irccdctl &, const RemoteCommandRequest &) const
+json::Value Command::request(Irccdctl &, const CommandRequest &) const
 {
 	return json::object({});
 }
 
-json::Value RemoteCommand::exec(Irccd &, const json::Value &) const
+json::Value Command::exec(Irccd &, const json::Value &) const
 {
 	return json::object({});
 }
 
-void RemoteCommand::result(Irccdctl &, const json::Value &response) const
+void Command::result(Irccdctl &, const json::Value &response) const
 {
 	auto it = response.find("error");
 
diff -r 786559f1937f -r c26754e419c4 lib/irccd/command.hpp
--- a/lib/irccd/command.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/command.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -47,7 +47,7 @@
  *
  * This class contains the resolved arguments from command line that can apply to the command.
  */
-class RemoteCommandRequest {
+class CommandRequest {
 public:
 	/**
 	 * The options given by command line.
@@ -70,7 +70,7 @@
 	 * \param options the options
 	 * \param args the arguments
 	 */
-	inline RemoteCommandRequest(Options options, Args args) noexcept
+	inline CommandRequest(Options options, Args args) noexcept
 		: m_options(std::move(options))
 		, m_args(std::move(args))
 	{
@@ -196,7 +196,7 @@
  * 3. Finally, the command receives the result in result() function and user can manipulate it. For convenience, the
  *    default implementation shows the error if any.
  */
-class RemoteCommand {
+class Command {
 public:
 	/**
 	 * \brief Defines available options for this command.
@@ -223,7 +223,7 @@
 	 * \param category the category (e.g. Server)
 	 * \param visible true if the command should be visible without verbosity
 	 */
-	inline RemoteCommand(std::string name, std::string category, bool visible = true) noexcept
+	inline Command(std::string name, std::string category, bool visible = true) noexcept
 		: m_name(std::move(name))
 		, m_category(std::move(category))
 		, m_visible(visible)
@@ -235,7 +235,7 @@
 	/**
 	 * Default destructor virtual.
 	 */
-	virtual ~RemoteCommand() = default;
+	virtual ~Command() = default;
 
 	/**
 	 * Return the command name, must not have spaces.
@@ -329,7 +329,7 @@
 	 * \return the JSON object to send to the daemon
 	 * \post the returned JSON value must be an object
 	 */
-	IRCCD_EXPORT virtual json::Value request(Irccdctl &irccdctl, const RemoteCommandRequest &args) const;
+	IRCCD_EXPORT virtual json::Value request(Irccdctl &irccdctl, const CommandRequest &args) const;
 
 	/**
 	 * Execute the command in the daemon.
@@ -361,7 +361,7 @@
 /**
  * \brief Option description for a command.
  */
-class RemoteCommand::Option {
+class Command::Option {
 private:
 	std::string m_id;
 	std::string m_simple;
@@ -456,7 +456,7 @@
 /**
  * \brief Argument description for command.
  */
-class RemoteCommand::Arg {
+class Command::Arg {
 private:
 	std::string m_name;
 	bool m_required;
diff -r 786559f1937f -r c26754e419c4 lib/irccd/irccdctl.cpp
--- a/lib/irccd/irccdctl.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/irccdctl.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -359,7 +359,7 @@
 	return result;
 }
 
-void Irccdctl::exec(const RemoteCommand &cmd, std::vector<std::string> args)
+void Irccdctl::exec(const Command &cmd, std::vector<std::string> args)
 {
 	// 1. Build options from command line arguments.
 	parser::Options def;
@@ -373,7 +373,7 @@
 	}
 
 	// 2. Parse them, remove them from args (in parser::read) and build the map with id.
-	RemoteCommandRequest::Options requestOptions;
+	CommandRequest::Options requestOptions;
 
 	for (const auto &pair : parser::read(args, def)) {
 		auto options = cmd.options();
@@ -391,7 +391,7 @@
 		throw std::runtime_error("too many arguments");
 
 	// 4. Construct the request, if the returned value is not an object, do not send anything (e.g. help).
-	json::Value request = cmd.request(*this, RemoteCommandRequest(std::move(requestOptions), std::move(args)));
+	json::Value request = cmd.request(*this, CommandRequest(std::move(requestOptions), std::move(args)));
 
 	if (!request.isObject())
 		return;
diff -r 786559f1937f -r c26754e419c4 lib/irccd/irccdctl.hpp
--- a/lib/irccd/irccdctl.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/irccdctl.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -97,7 +97,7 @@
 	 * \param cmd the command
 	 * \param args the arguments
 	 */
-	IRCCD_EXPORT void exec(const RemoteCommand &cmd, std::vector<std::string> args);
+	IRCCD_EXPORT void exec(const Command &cmd, std::vector<std::string> args);
 
 	/**
 	 * Execute the given alias.
diff -r 786559f1937f -r c26754e419c4 lib/irccd/service-command.cpp
--- a/lib/irccd/service-command.cpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/service-command.cpp	Thu Jun 09 13:50:55 2016 +0200
@@ -83,7 +83,7 @@
 	return find(name) != nullptr;
 }
 
-std::shared_ptr<RemoteCommand> CommandService::find(const std::string &name) const noexcept
+std::shared_ptr<Command> CommandService::find(const std::string &name) const noexcept
 {
 	auto it = std::find_if(m_commands.begin(), m_commands.end(), [&] (const auto &cmd) {
 		return cmd->name() == name;
diff -r 786559f1937f -r c26754e419c4 lib/irccd/service-command.hpp
--- a/lib/irccd/service-command.hpp	Thu Jun 09 13:47:40 2016 +0200
+++ b/lib/irccd/service-command.hpp	Thu Jun 09 13:50:55 2016 +0200
@@ -31,7 +31,7 @@
 
 namespace irccd {
 
-class RemoteCommand;
+class Command;
 
 /**
  * \brief Store remote commands.
@@ -39,7 +39,7 @@
  */
 class CommandService {
 private:
-	std::vector<std::shared_ptr<RemoteCommand>> m_commands;
+	std::vector<std::shared_ptr<Command>> m_commands;
 
 public:
 	/**
@@ -63,7 +63,7 @@
 	 * \param name the command name
 	 * \return the command or empty one if not found
 	 */
-	IRCCD_EXPORT std::shared_ptr<RemoteCommand> find(const std::string &name) const noexcept;
+	IRCCD_EXPORT std::shared_ptr<Command> find(const std::string &name) const noexcept;
 };
 
 } // !irccd