Use consistent casing when referring to vhosts and vidents.

20 files changed, 127 insertions, 127 deletions

diff --git a/modules/database/db_atheme.cpp b/modules/database/db_atheme.cpp
index 3f62c29ca..c0a628bfd 100644
--- a/modules/database/db_atheme.cpp
+++ b/modules/database/db_atheme.cpp
@@ -1115,7 +1115,7 @@ private:
 			if (nick_vhost != data->vhost_nick.end())
 				vhost = nick_vhost->second;
 			if (!vhost.empty())
-				na->SetVhost("", vhost, data->vhost_creator, data->vhost_ts);
+				na->SetVHost("", vhost, data->vhost_creator, data->vhost_ts);
 		}
 
 		return true;
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index e95cc19ef..55252177a 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -690,7 +690,7 @@ static void LoadVHosts()
 			continue;
 		}
 
-		na->SetVhost(ident, host, creator, vtime);
+		na->SetVHost(ident, host, creator, vtime);
 
 		Log() << "Loaded vhost for " << na->nick;
 	}
diff --git a/modules/hostserv/hostserv.cpp b/modules/hostserv/hostserv.cpp
index bdd1920e1..81257cf4f 100644
--- a/modules/hostserv/hostserv.cpp
+++ b/modules/hostserv/hostserv.cpp
@@ -42,35 +42,35 @@ public:
 			return;
 
 		const NickAlias *na = NickAlias::Find(u->nick);
-		if (!na || na->nc != u->Account() || !na->HasVhost())
+		if (!na || na->nc != u->Account() || !na->HasVHost())
 			na = NickAlias::Find(u->Account()->display);
-		if (!na || !na->HasVhost())
+		if (!na || !na->HasVHost())
 			return;
 
-		if (u->vhost.empty() || !u->vhost.equals_cs(na->GetVhostHost()) || (!na->GetVhostIdent().empty() && !u->GetVIdent().equals_cs(na->GetVhostIdent())))
+		if (u->vhost.empty() || !u->vhost.equals_cs(na->GetVHostHost()) || (!na->GetVHostIdent().empty() && !u->GetVIdent().equals_cs(na->GetVHostIdent())))
 		{
-			IRCD->SendVhost(u, na->GetVhostIdent(), na->GetVhostHost());
+			IRCD->SendVHost(u, na->GetVHostIdent(), na->GetVHostHost());
 
-			u->vhost = na->GetVhostHost();
+			u->vhost = na->GetVHostHost();
 			u->UpdateHost();
 
-			if (IRCD->CanSetVIdent && !na->GetVhostIdent().empty())
-				u->SetVIdent(na->GetVhostIdent());
+			if (IRCD->CanSetVIdent && !na->GetVHostIdent().empty())
+				u->SetVIdent(na->GetVHostIdent());
 
 			if (HostServ)
 			{
 				u->SendMessage(HostServ, _("Your vhost of \002%s\002 is now activated."),
-					na->GetVhostMask().c_str());
+					na->GetVHostMask().c_str());
 			}
 		}
 	}
 
 	void OnNickDrop(CommandSource &source, NickAlias *na) override
 	{
-		if (na->HasVhost())
+		if (na->HasVHost())
 		{
-			FOREACH_MOD(OnDeleteVhost, (na));
-			na->RemoveVhost();
+			FOREACH_MOD(OnDeleteVHost, (na));
+			na->RemoveVHost();
 		}
 	}
 
@@ -87,7 +87,7 @@ public:
 		return EVENT_CONTINUE;
 	}
 
-	void OnSetVhost(NickAlias *na) override
+	void OnSetVHost(NickAlias *na) override
 	{
 		if (Config->GetModule(this)->Get<bool>("activate_on_set"))
 		{
@@ -95,31 +95,31 @@ public:
 
 			if (u && u->Account() == na->nc)
 			{
-				IRCD->SendVhost(u, na->GetVhostIdent(), na->GetVhostHost());
+				IRCD->SendVHost(u, na->GetVHostIdent(), na->GetVHostHost());
 
-				u->vhost = na->GetVhostHost();
+				u->vhost = na->GetVHostHost();
 				u->UpdateHost();
 
-				if (IRCD->CanSetVIdent && !na->GetVhostIdent().empty())
-					u->SetVIdent(na->GetVhostIdent());
+				if (IRCD->CanSetVIdent && !na->GetVHostIdent().empty())
+					u->SetVIdent(na->GetVHostIdent());
 
 				if (HostServ)
 				{
 					u->SendMessage(HostServ, _("Your vhost of \002%s\002 is now activated."),
-						na->GetVhostMask().c_str());
+						na->GetVHostMask().c_str());
 				}
 			}
 		}
 	}
 
-	void OnDeleteVhost(NickAlias *na) override
+	void OnDeleteVHost(NickAlias *na) override
 	{
 		if (Config->GetModule(this)->Get<bool>("activate_on_set"))
 		{
 			User *u = User::Find(na->nick);
 
 			if (u && u->Account() == na->nc)
-				IRCD->SendVhostDel(u);
+				IRCD->SendVHostDel(u);
 		}
 	}
 };
diff --git a/modules/hostserv/hs_del.cpp b/modules/hostserv/hs_del.cpp
index eb60afc00..1c70e9c68 100644
--- a/modules/hostserv/hs_del.cpp
+++ b/modules/hostserv/hs_del.cpp
@@ -34,9 +34,9 @@ public:
 		if (na)
 		{
 			Log(LOG_ADMIN, source, this) << "for user " << na->nick;
-			FOREACH_MOD(OnDeleteVhost, (na));
-			na->RemoveVhost();
-			source.Reply(_("Vhost for \002%s\002 removed."), nick.c_str());
+			FOREACH_MOD(OnDeleteVHost, (na));
+			na->RemoveVHost();
+			source.Reply(_("VHost for \002%s\002 removed."), nick.c_str());
 		}
 		else
 			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
@@ -74,15 +74,15 @@ public:
 		NickAlias *na = NickAlias::Find(nick);
 		if (na)
 		{
-			FOREACH_MOD(OnDeleteVhost, (na));
+			FOREACH_MOD(OnDeleteVHost, (na));
 			const NickCore *nc = na->nc;
 			for (auto *alias : *nc->aliases)
 			{
 				na = alias;
-				na->RemoveVhost();
+				na->RemoveVHost();
 			}
 			Log(LOG_ADMIN, source, this) << "for all nicks in group " << nc->display;
-			source.Reply(_("vhosts for group \002%s\002 have been removed."), nc->display.c_str());
+			source.Reply(_("VHosts for group \002%s\002 have been removed."), nc->display.c_str());
 		}
 		else
 			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
diff --git a/modules/hostserv/hs_group.cpp b/modules/hostserv/hs_group.cpp
index d28f00f7c..a030360b3 100644
--- a/modules/hostserv/hs_group.cpp
+++ b/modules/hostserv/hs_group.cpp
@@ -22,7 +22,7 @@ public:
 		if (setting)
 			return;
 
-		if (!na || !na->HasVhost())
+		if (!na || !na->HasVHost())
 			return;
 
 		setting = true;
@@ -30,8 +30,8 @@ public:
 		{
 			if (nick && nick != na)
 			{
-				nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
-				FOREACH_MOD(OnSetVhost, (nick));
+				nick->SetVHost(na->GetVHostIdent(), na->GetVHostHost(), na->GetVHostCreator());
+				FOREACH_MOD(OnSetVHost, (nick));
 			}
 		}
 		setting = false;
@@ -51,11 +51,11 @@ public:
 		}
 
 		NickAlias *na = NickAlias::Find(source.GetNick());
-		if (na && source.GetAccount() == na->nc && na->HasVhost())
+		if (na && source.GetAccount() == na->nc && na->HasVHost())
 		{
 			this->Sync(na);
 			source.Reply(_("All vhosts in the group \002%s\002 have been set to \002%s\002."),
-				source.nc->display.c_str(), na->GetVhostMask().c_str());
+				source.nc->display.c_str(), na->GetVHostMask().c_str());
 		}
 		else
 			source.Reply(HOST_NOT_ASSIGNED);
@@ -89,7 +89,7 @@ public:
 			throw ModuleException("Your IRCd does not support vhosts");
 	}
 
-	void OnSetVhost(NickAlias *na) override
+	void OnSetVHost(NickAlias *na) override
 	{
 		if (!synconset)
 			return;
diff --git a/modules/hostserv/hs_list.cpp b/modules/hostserv/hs_list.cpp
index dd459fd78..08d51f1f2 100644
--- a/modules/hostserv/hs_list.cpp
+++ b/modules/hostserv/hs_list.cpp
@@ -53,25 +53,25 @@ public:
 
 		unsigned display_counter = 0, listmax = Config->GetModule(this->owner)->Get<unsigned>("listmax", "50");
 		ListFormatter list(source.GetAccount());
-		list.AddColumn(_("Number")).AddColumn(_("Nick")).AddColumn(_("Vhost")).AddColumn(_("Creator")).AddColumn(_("Created"));
+		list.AddColumn(_("Number")).AddColumn(_("Nick")).AddColumn(_("VHost")).AddColumn(_("Creator")).AddColumn(_("Created"));
 
 		for (const auto &[_, na] : *NickAliasList)
 		{
-			if (!na->HasVhost())
+			if (!na->HasVHost())
 				continue;
 
 			if (!key.empty() && key[0] != '#')
 			{
-				if ((Anope::Match(na->nick, key) || Anope::Match(na->GetVhostHost(), key)) && display_counter < listmax)
+				if ((Anope::Match(na->nick, key) || Anope::Match(na->GetVHostHost(), key)) && display_counter < listmax)
 				{
 					++display_counter;
 
 					ListFormatter::ListEntry entry;
 					entry["Number"] = Anope::ToString(display_counter);
 					entry["Nick"] = na->nick;
-					entry["Vhost"] = na->GetVhostMask();
-					entry["Creator"] = na->GetVhostCreator();
-					entry["Created"] = Anope::strftime(na->GetVhostCreated(), NULL, true);
+					entry["VHost"] = na->GetVHostMask();
+					entry["Creator"] = na->GetVHostCreator();
+					entry["Created"] = Anope::strftime(na->GetVHostCreated(), NULL, true);
 					list.AddEntry(entry);
 				}
 			}
@@ -87,9 +87,9 @@ public:
 					ListFormatter::ListEntry entry;
 					entry["Number"] = Anope::ToString(display_counter);
 					entry["Nick"] = na->nick;
-					entry["Vhost"] = na->GetVhostMask();
-					entry["Creator"] = na->GetVhostCreator();
-					entry["Created"] = Anope::strftime(na->GetVhostCreated(), NULL, true);
+					entry["VHost"] = na->GetVHostMask();
+					entry["Creator"] = na->GetVHostCreator();
+					entry["Created"] = Anope::strftime(na->GetVHostCreated(), NULL, true);
 					list.AddEntry(entry);
 				}
 			}
diff --git a/modules/hostserv/hs_off.cpp b/modules/hostserv/hs_off.cpp
index 8e4036726..8689ff919 100644
--- a/modules/hostserv/hs_off.cpp
+++ b/modules/hostserv/hs_off.cpp
@@ -26,15 +26,15 @@ public:
 		User *u = source.GetUser();
 
 		const NickAlias *na = NickAlias::Find(u->nick);
-		if (!na || na->nc != u->Account() || !na->HasVhost())
+		if (!na || na->nc != u->Account() || !na->HasVHost())
 			na = NickAlias::Find(u->Account()->display);
 
-		if (!na || !na->HasVhost())
+		if (!na || !na->HasVHost())
 			source.Reply(HOST_NOT_ASSIGNED);
 		else
 		{
 			u->vhost.clear();
-			IRCD->SendVhostDel(u);
+			IRCD->SendVHostDel(u);
 			u->UpdateHost();
 			Log(LOG_COMMAND, source, this) << "to disable their vhost";
 			source.Reply(_("Your vhost was removed and the normal cloaking restored."));
diff --git a/modules/hostserv/hs_on.cpp b/modules/hostserv/hs_on.cpp
index e37b1278e..d61975b0b 100644
--- a/modules/hostserv/hs_on.cpp
+++ b/modules/hostserv/hs_on.cpp
@@ -28,16 +28,16 @@ public:
 
 		User *u = source.GetUser();
 		const NickAlias *na = NickAlias::Find(u->nick);
-		if (!na || na->nc != u->Account() || !na->HasVhost())
+		if (!na || na->nc != u->Account() || !na->HasVHost())
 			na = NickAlias::Find(u->Account()->display);
-		if (na && u->Account() == na->nc && na->HasVhost())
+		if (na && u->Account() == na->nc && na->HasVHost())
 		{
-			source.Reply(_("Your vhost of \002%s\002 is now activated."), na->GetVhostMask().c_str());
-			Log(LOG_COMMAND, source, this) << "to enable their vhost of " << na->GetVhostMask();
-			IRCD->SendVhost(u, na->GetVhostIdent(), na->GetVhostHost());
-			u->vhost = na->GetVhostHost();
-			if (IRCD->CanSetVIdent && !na->GetVhostIdent().empty())
-				u->SetVIdent(na->GetVhostIdent());
+			source.Reply(_("Your vhost of \002%s\002 is now activated."), na->GetVHostMask().c_str());
+			Log(LOG_COMMAND, source, this) << "to enable their vhost of " << na->GetVHostMask();
+			IRCD->SendVHost(u, na->GetVHostIdent(), na->GetVHostHost());
+			u->vhost = na->GetVHostHost();
+			if (IRCD->CanSetVIdent && !na->GetVHostIdent().empty())
+				u->SetVIdent(na->GetVHostIdent());
 			u->UpdateHost();
 		}
 		else
diff --git a/modules/hostserv/hs_request.cpp b/modules/hostserv/hs_request.cpp
index b53cd6fa9..c11a1ad90 100644
--- a/modules/hostserv/hs_request.cpp
+++ b/modules/hostserv/hs_request.cpp
@@ -19,7 +19,7 @@
 
 static ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
 
-static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vIdent, const Anope::string &vHost);
+static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vident, const Anope::string &vhost);
 
 struct HostRequestImpl final
 	: HostRequest
@@ -75,7 +75,7 @@ class CommandHSRequest final
 public:
 	CommandHSRequest(Module *creator) : Command(creator, "hostserv/request", 1, 1)
 	{
-		this->SetDesc(_("Request a vHost for your nick"));
+		this->SetDesc(_("Request a vhost for your nick"));
 		this->SetSyntax(_("vhost"));
 	}
 
@@ -157,7 +157,7 @@ public:
 		time_t send_delay = Config->GetModule("memoserv")->Get<time_t>("senddelay");
 		if (Config->GetModule(this->owner)->Get<bool>("memooper") && send_delay > 0 && u && u->lastmemosend + send_delay > Anope::CurTime)
 		{
-			source.Reply(_("Please wait %lu seconds before requesting a new vHost."), (unsigned long)send_delay);
+			source.Reply(_("Please wait %lu seconds before requesting a new vhost."), (unsigned long)send_delay);
 			u->lastmemosend = Anope::CurTime;
 			return;
 		}
@@ -169,7 +169,7 @@ public:
 		req.time = Anope::CurTime;
 		na->Extend<HostRequestImpl>("hostrequest", req);
 
-		source.Reply(_("Your vHost has been requested."));
+		source.Reply(_("Your vhost has been requested."));
 		req_send_memos(owner, source, user, host);
 		Log(LOG_COMMAND, source, this) << "to request new vhost " << (!user.empty() ? user + "@" : "") << host;
 	}
@@ -178,7 +178,7 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Request the given vHost to be activated for your nick by the\n"
+		source.Reply(_("Request the given vhost to be activated for your nick by the\n"
 			"network administrators. Please be patient while your request\n"
 			"is being considered."));
 		return true;
@@ -191,7 +191,7 @@ class CommandHSActivate final
 public:
 	CommandHSActivate(Module *creator) : Command(creator, "hostserv/activate", 1, 1)
 	{
-		this->SetDesc(_("Approve the requested vHost of a user"));
+		this->SetDesc(_("Approve the requested vhost of a user"));
 		this->SetSyntax(_("\037nick\037"));
 	}
 
@@ -209,13 +209,13 @@ public:
 		HostRequestImpl *req = na ? na->GetExt<HostRequestImpl>("hostrequest") : NULL;
 		if (req)
 		{
-			na->SetVhost(req->ident, req->host, source.GetNick(), req->time);
-			FOREACH_MOD(OnSetVhost, (na));
+			na->SetVHost(req->ident, req->host, source.GetNick(), req->time);
+			FOREACH_MOD(OnSetVHost, (na));
 
 			if (Config->GetModule(this->owner)->Get<bool>("memouser") && memoserv)
-				memoserv->Send(source.service->nick, na->nick, _("[auto memo] Your requested vHost has been approved."), true);
+				memoserv->Send(source.service->nick, na->nick, _("[auto memo] Your requested vhost has been approved."), true);
 
-			source.Reply(_("vHost for %s has been activated."), na->nick.c_str());
+			source.Reply(_("VHost for %s has been activated."), na->nick.c_str());
 			Log(LOG_COMMAND, source, this) << "for " << na->nick << " for vhost " << (!req->ident.empty() ? req->ident + "@" : "") << req->host;
 			na->Shrink<HostRequestImpl>("hostrequest");
 		}
@@ -227,7 +227,7 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Activate the requested vHost for the given nick."));
+		source.Reply(_("Activate the requested vhost for the given nick."));
 		if (Config->GetModule(this->owner)->Get<bool>("memouser"))
 			source.Reply(_("A memo informing the user will also be sent."));
 
@@ -241,7 +241,7 @@ class CommandHSReject final
 public:
 	CommandHSReject(Module *creator) : Command(creator, "hostserv/reject", 1, 2)
 	{
-		this->SetDesc(_("Reject the requested vHost of a user"));
+		this->SetDesc(_("Reject the requested vhost of a user"));
 		this->SetSyntax(_("\037nick\037 [\037reason\037]"));
 	}
 
@@ -266,14 +266,14 @@ public:
 			{
 				Anope::string message;
 				if (!reason.empty())
-					message = Anope::printf(_("[auto memo] Your requested vHost has been rejected. Reason: %s"), reason.c_str());
+					message = Anope::printf(_("[auto memo] Your requested vhost has been rejected. Reason: %s"), reason.c_str());
 				else
-					message = _("[auto memo] Your requested vHost has been rejected.");
+					message = _("[auto memo] Your requested vhost has been rejected.");
 
 				memoserv->Send(source.service->nick, nick, Language::Translate(source.GetAccount(), message.c_str()), true);
 			}
 
-			source.Reply(_("vHost for %s has been rejected."), nick.c_str());
+			source.Reply(_("VHost for %s has been rejected."), nick.c_str());
 			Log(LOG_COMMAND, source, this) << "to reject vhost for " << nick << " (" << (!reason.empty() ? reason : "no reason") << ")";
 		}
 		else
@@ -284,7 +284,7 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Reject the requested vHost for the given nick."));
+		source.Reply(_("Reject the requested vhost for the given nick."));
 		if (Config->GetModule(this->owner)->Get<bool>("memouser"))
 			source.Reply(_("A memo informing the user will also be sent, which includes the reason for the rejection if supplied."));
 
@@ -307,7 +307,7 @@ public:
 		unsigned display_counter = 0, listmax = Config->GetModule(this->owner)->Get<unsigned>("listmax");
 		ListFormatter list(source.GetAccount());
 
-		list.AddColumn(_("Number")).AddColumn(_("Nick")).AddColumn(_("Vhost")).AddColumn(_("Created"));
+		list.AddColumn(_("Number")).AddColumn(_("Nick")).AddColumn(_("VHost")).AddColumn(_("Created"));
 
 		for (const auto &[nick, na] : *NickAliasList)
 		{
@@ -323,9 +323,9 @@ public:
 				entry["Number"] = Anope::ToString(display_counter);
 				entry["Nick"] = nick;
 				if (!hr->ident.empty())
-					entry["Vhost"] = hr->ident + "@" + hr->host;
+					entry["VHost"] = hr->ident + "@" + hr->host;
 				else
-					entry["Vhost"] = hr->host;
+					entry["VHost"] = hr->host;
 				entry["Created"] = Anope::strftime(hr->time, NULL, true);
 				list.AddEntry(entry);
 			}
@@ -371,13 +371,13 @@ public:
 	}
 };
 
-static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vIdent, const Anope::string &vHost)
+static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vident, const Anope::string &vhost)
 {
 	Anope::string host;
-	if (!vIdent.empty())
-		host = vIdent + "@" + vHost;
+	if (!vident.empty())
+		host = vident + "@" + vhost;
 	else
-		host = vHost;
+		host = vhost;
 
 	if (Config->GetModule(me)->Get<bool>("memooper") && memoserv)
 	{
@@ -387,7 +387,7 @@ static void req_send_memos(Module *me, CommandSource &source, const Anope::strin
 			if (!na)
 				continue;
 
-			Anope::string message = Anope::printf(_("[auto memo] vHost \002%s\002 has been requested by %s."), host.c_str(), source.GetNick().c_str());
+			Anope::string message = Anope::printf(_("[auto memo] VHost \002%s\002 has been requested by %s."), host.c_str(), source.GetNick().c_str());
 
 			memoserv->Send(source.service->nick, na->nick, message, true);
 		}
diff --git a/modules/hostserv/hs_set.cpp b/modules/hostserv/hs_set.cpp
index 55f562e00..08c1f6799 100644
--- a/modules/hostserv/hs_set.cpp
+++ b/modules/hostserv/hs_set.cpp
@@ -85,9 +85,9 @@ public:
 
 		Log(LOG_ADMIN, source, this) << "to set the vhost of " << na->nick << " to " << (!user.empty() ? user + "@" : "") << host;
 
-		na->SetVhost(user, host, source.GetNick());
-		FOREACH_MOD(OnSetVhost, (na));
-		source.Reply(_("VHost for \002%s\002 set to \002%s\002."), nick.c_str(), na->GetVhostMask().c_str());
+		na->SetVHost(user, host, source.GetNick());
+		FOREACH_MOD(OnSetVHost, (na));
+		source.Reply(_("VHost for \002%s\002 set to \002%s\002."), nick.c_str(), na->GetVHostMask().c_str());
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -95,7 +95,7 @@ public:
 		this->SendSyntax(source);
 		source.Reply(" ");
 		source.Reply(_("Sets the vhost for the given nick to that of the given\n"
-				"hostmask.  If your IRCD supports vIdents, then using\n"
+				"hostmask.  If your IRCD supports vidents, then using\n"
 				"SET <nick> <ident>@<hostmask> set idents for users as\n"
 				"well as vhosts."));
 		return true;
@@ -107,13 +107,13 @@ class CommandHSSetAll final
 {
 	static void Sync(const NickAlias *na)
 	{
-		if (!na || !na->HasVhost())
+		if (!na || !na->HasVHost())
 			return;
 
 		for (auto *nick : *na->nc->aliases)
 		{
 			if (nick && nick != na)
-				nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
+				nick->SetVHost(na->GetVHostIdent(), na->GetVHostHost(), na->GetVHostCreator());
 		}
 	}
 
@@ -188,10 +188,10 @@ public:
 
 		Log(LOG_ADMIN, source, this) << "to set the vhost of " << na->nick << " to " << (!user.empty() ? user + "@" : "") << host;
 
-		na->SetVhost(user, host, source.GetNick());
+		na->SetVHost(user, host, source.GetNick());
 		this->Sync(na);
-		FOREACH_MOD(OnSetVhost, (na));
-		source.Reply(_("VHost for group \002%s\002 set to \002%s\002."), nick.c_str(), na->GetVhostMask().c_str());
+		FOREACH_MOD(OnSetVHost, (na));
+		source.Reply(_("VHost for group \002%s\002 set to \002%s\002."), nick.c_str(), na->GetVHostMask().c_str());
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -199,7 +199,7 @@ public:
 		this->SendSyntax(source);
 		source.Reply(" ");
 		source.Reply(_("Sets the vhost for all nicks in the same group as that\n"
-				"of the given nick.  If your IRCD supports vIdents, then\n"
+				"of the given nick.  If your IRCD supports vidents, then\n"
 				"using SETALL <nick> <ident>@<hostmask> will set idents\n"
 				"for users as well as vhosts.\n"
 				"* NOTE, this will not update the vhost for any nicks\n"
diff --git a/modules/nickserv/ns_info.cpp b/modules/nickserv/ns_info.cpp
index 469a0c1f3..771b3a890 100644
--- a/modules/nickserv/ns_info.cpp
+++ b/modules/nickserv/ns_info.cpp
@@ -101,8 +101,8 @@ public:
 
 			if (show_hidden)
 			{
-				if (na->HasVhost())
-					info[_("VHost")] = na->GetVhostMask();
+				if (na->HasVHost())
+					info[_("VHost")] = na->GetVHostMask();
 			}
 
 			FOREACH_MOD(OnNickInfo, (source, na, info, show_hidden));
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index b060c4f43..0845938de 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -263,12 +263,12 @@ public:
 		this->SendSQLineDel(&x);
 	}
 
-	void SendVhost(User *u, const Anope::string &ident, const Anope::string &host) override
+	void SendVHost(User *u, const Anope::string &ident, const Anope::string &host) override
 	{
 		Uplink::Send("SVSHOST", u->GetUID(), u->timestamp, host);
 	}
 
-	void SendVhostDel(User *u) override
+	void SendVHostDel(User *u) override
 	{
 		Uplink::Send("SVSHOST", u->GetUID(), u->timestamp, u->host);
 	}
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index cd2ad2296..6f8a1a431 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -94,14 +94,14 @@ private:
 		return nicks.substr(1);
 	}
 
-	static void SendChgIdentInternal(const Anope::string &uid, const Anope::string &vIdent)
+	static void SendChgIdentInternal(const Anope::string &uid, const Anope::string &vident)
 	{
 		if (!Servers::Capab.count("CHGIDENT"))
 		{
 			Log() << "Unable to change the vident of " << uid << " as the remote server does not have the chgident module loaded.";
 			return;
 		}
-		Uplink::Send("ENCAP", uid.substr(0, 3), "CHGIDENT", uid, vIdent);
+		Uplink::Send("ENCAP", uid.substr(0, 3), "CHGIDENT", uid, vident);
 	}
 
 	static void SendChgHostInternal(const Anope::string &uid, const Anope::string &vhost)
@@ -302,7 +302,7 @@ public:
 		}
 	}
 
-	void SendVhostDel(User *u) override
+	void SendVHostDel(User *u) override
 	{
 		UserMode *um = ModeManager::FindUserModeByName("CLOAK");
 
@@ -477,10 +477,10 @@ public:
 			SendAddLine("Q", x->mask, timeleft, x->by, x->GetReason());
 	}
 
-	void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) override
+	void SendVHost(User *u, const Anope::string &vident, const Anope::string &vhost) override
 	{
-		if (!vIdent.empty())
-			this->SendChgIdentInternal(u->GetUID(), vIdent);
+		if (!vident.empty())
+			this->SendChgIdentInternal(u->GetUID(), vident);
 
 		if (!vhost.empty())
 			this->SendChgHostInternal(u->GetUID(), vhost);
@@ -600,11 +600,11 @@ public:
 
 		if (na)
 		{
-			if (!na->GetVhostIdent().empty())
-				SendChgHostInternal(uid, na->GetVhostIdent());
+			if (!na->GetVHostIdent().empty())
+				SendChgHostInternal(uid, na->GetVHostIdent());
 
-			if (!na->GetVhostHost().empty())
-				SendChgHostInternal(uid, na->GetVhostHost());
+			if (!na->GetVHostHost().empty())
+				SendChgHostInternal(uid, na->GetVHostHost());
 
 			// Mark this SASL session as pending user introduction.
 			SASLUser su;
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index fc56d1055..a6ed1c377 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -125,10 +125,10 @@ public:
 		Uplink::Send("SERVER", server->GetName(), server->GetHops(), server->GetDescription());
 	}
 
-	void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) override
+	void SendVHost(User *u, const Anope::string &vident, const Anope::string &vhost) override
 	{
-		if (!vIdent.empty())
-			Uplink::Send("METADATA", u->nick, "user", vIdent);
+		if (!vident.empty())
+			Uplink::Send("METADATA", u->nick, "user", vident);
 
 		Uplink::Send("METADATA", u->nick, "cloakhost", vhost);
 		if (!u->HasMode("CLOAK"))
@@ -138,9 +138,9 @@ public:
 		}
 	}
 
-	void SendVhostDel(User *u) override
+	void SendVHostDel(User *u) override
 	{
-		this->SendVhost(u, u->GetIdent(), "");
+		this->SendVHost(u, u->GetIdent(), "");
 	}
 
 	bool Format(Anope::string &message, const Anope::map<Anope::string> &tags, const MessageSource &source, const Anope::string &command, const std::vector<Anope::string> &params) override
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 77ab81d38..062c86e6b 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -83,7 +83,7 @@ public:
 		Uplink::Send("ENCAP", u->server->GetName(), "SVSNICK", u->GetUID(), u->timestamp, newnick, when);
 	}
 
-	void SendVhost(User *u, const Anope::string &ident, const Anope::string &host) override
+	void SendVHost(User *u, const Anope::string &ident, const Anope::string &host) override
 	{
 		if (!ident.empty())
 			Uplink::Send("ENCAP", '*', "CHGIDENT", u->GetUID(), ident);
@@ -92,7 +92,7 @@ public:
 		u->SetMode(Config->GetClient("HostServ"), "CLOAK");
 	}
 
-	void SendVhostDel(User *u) override
+	void SendVHostDel(User *u) override
 	{
 		u->RemoveMode(Config->GetClient("HostServ"), "CLOAK");
 	}
@@ -186,7 +186,7 @@ public:
 	void SendSVSLogin(const Anope::string &uid, NickAlias *na) override
 	{
 		Server *s = Server::Find(uid.substr(0, 3));
-		Uplink::Send("ENCAP", s ? s->GetName() : uid.substr(0, 3), "SVSLOGIN", uid, '*', '*', na->GetVhostHost().empty() ? "*" : na->GetVhostHost(), na->nc->display);
+		Uplink::Send("ENCAP", s ? s->GetName() : uid.substr(0, 3), "SVSLOGIN", uid, '*', '*', na->GetVHostHost().empty() ? "*" : na->GetVHostHost(), na->nc->display);
 	}
 
 	void SendSVSNOOP(const Server *server, bool set) override
diff --git a/modules/protocol/solanum.cpp b/modules/protocol/solanum.cpp
index d0ce08d79..3b2e22f85 100644
--- a/modules/protocol/solanum.cpp
+++ b/modules/protocol/solanum.cpp
@@ -141,14 +141,14 @@ public:
 		Uplink::Send("ENCAP", '*', "NICKDELAY", 0, nick);
 	}
 
-	void SendVhost(User *u, const Anope::string &ident, const Anope::string &host) override
+	void SendVHost(User *u, const Anope::string &ident, const Anope::string &host) override
 	{
 		Uplink::Send("ENCAP", '*', "CHGHOST", u->GetUID(), host);
 	}
 
-	void SendVhostDel(User *u) override
+	void SendVHostDel(User *u) override
 	{
-		this->SendVhost(u, "", u->host);
+		this->SendVHost(u, "", u->host);
 	}
 
 	void SendSASLMessage(const SASL::Message &message) override
@@ -166,8 +166,8 @@ public:
 		Server *s = Server::Find(uid.substr(0, 3));
 
 		Uplink::Send("ENCAP", s ? s->GetName() : uid.substr(0, 3), "SVSLOGIN", uid, '*',
-			na && !na->GetVhostIdent().empty() ? na->GetVhostIdent() : '*',
-			na && !na->GetVhostHost().empty() ? na->GetVhostHost() : '*',
+			na && !na->GetVHostIdent().empty() ? na->GetVHostIdent() : '*',
+			na && !na->GetVHostHost().empty() ? na->GetVHostHost() : '*',
 			na ? na->nc->display : "0");
 	}
 };
diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp
index 195ad617c..eca2e54df 100644
--- a/modules/protocol/unrealircd.cpp
+++ b/modules/protocol/unrealircd.cpp
@@ -83,7 +83,7 @@ private:
 		Uplink::Send(bi, "PRIVMSG", "$" + dest->GetName(), msg);
 	}
 
-	void SendVhostDel(User *u) override
+	void SendVHostDel(User *u) override
 	{
 		BotInfo *HostServ = Config->GetClient("HostServ");
 		u->RemoveMode(HostServ, "VHOST");
@@ -199,10 +199,10 @@ private:
 
 	/* Functions that use serval cmd functions */
 
-	void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost) override
+	void SendVHost(User *u, const Anope::string &vident, const Anope::string &vhost) override
 	{
-		if (!vIdent.empty())
-			Uplink::Send("CHGIDENT", u->GetUID(), vIdent);
+		if (!vident.empty())
+			Uplink::Send("CHGIDENT", u->GetUID(), vident);
 
 		if (!vhost.empty())
 			Uplink::Send("CHGHOST", u->GetUID(), vhost);
@@ -411,11 +411,11 @@ private:
 
 		if (na)
 		{
-			if (!na->GetVhostIdent().empty())
-				Uplink::Send("CHGIDENT", uid, na->GetVhostIdent());
+			if (!na->GetVHostIdent().empty())
+				Uplink::Send("CHGIDENT", uid, na->GetVHostIdent());
 
-			if (!na->GetVhostHost().empty())
-				Uplink::Send("CHGHOST", uid, na->GetVhostHost());
+			if (!na->GetVHostHost().empty())
+				Uplink::Send("CHGHOST", uid, na->GetVHostHost());
 		}
 
 		Uplink::Send("SVSLOGIN", distmask, uid, na ? na->nc->display : "0");
diff --git a/modules/webcpanel/pages/hostserv/request.cpp b/modules/webcpanel/pages/hostserv/request.cpp
index 0a8513c76..d4446db04 100644
--- a/modules/webcpanel/pages/hostserv/request.cpp
+++ b/modules/webcpanel/pages/hostserv/request.cpp
@@ -21,8 +21,8 @@ bool WebCPanel::HostServ::Request::OnRequest(HTTPProvider *server, const Anope::
 		WebPanel::RunCommand(client, na->nc->display, na->nc, "HostServ", "hostserv/request", params, replacements, "CMDR");
 	}
 
-	if (na->HasVhost())
-		replacements["VHOST"] = na->GetVhostMask();
+	if (na->HasVHost())
+		replacements["VHOST"] = na->GetVHostMask();
 	if (ServiceReference<Command>("Command", "hostserv/request"))
 		replacements["CAN_REQUEST"] = "YES";
 	TemplateFileServer page("hostserv/request.html");
diff --git a/modules/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp
index 6a47e541c..a75862dc7 100644
--- a/modules/webcpanel/pages/nickserv/info.cpp
+++ b/modules/webcpanel/pages/nickserv/info.cpp
@@ -80,8 +80,8 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 	if (!na->nc->email.empty())
 		replacements["EMAIL"] = na->nc->email;
 	replacements["TIME_REGISTERED"] = Anope::strftime(na->time_registered, na->nc);
-	if (na->HasVhost())
-		replacements["VHOST"] = na->GetVhostMask();
+	if (na->HasVHost())
+		replacements["VHOST"] = na->GetVHostMask();
 	Anope::string *greet = na->nc->GetExt<Anope::string>("greet");
 	if (greet)
 		replacements["GREET"] = *greet;
diff --git a/modules/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
index 1a0d22003..97ca439e4 100644
--- a/modules/webcpanel/webcpanel.cpp
+++ b/modules/webcpanel/webcpanel.cpp
@@ -173,7 +173,7 @@ public:
 			s.name = HostServ->nick;
 
 			SubSection ss;
-			ss.name = "vHost Request";
+			ss.name = "VHost Request";
 			ss.url = "/hostserv/request";
 			s.subsections.push_back(ss);
 			provider->RegisterPage(&this->hostserv_request);