NS_VERBOTEN -> NS_FORBIDDEN, CS_VERBOTEN -> CS_FORBIDDEN, etc.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1973 5417fbe8-f217-4b02-8779-1006273d7864

72 files changed, 112 insertions, 112 deletions

diff --git a/src/channels.c b/src/channels.c
index ab5e0b3a8..758af8448 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1149,7 +1149,7 @@ void do_cmode(const char *source, int ac, const char **av)
 	if (!chan) {
 		if (debug) {
 			ci = cs_findchan(av[0]);
-			if (!(ci && (ci->flags & CI_VERBOTEN)))
+			if (!(ci && (ci->flags & CI_FORBIDDEN)))
 				alog("debug: MODE %s for nonexistent channel %s",
 					 merge_args(ac - 1, av + 1), av[0]);
 		}
@@ -1363,7 +1363,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
 	if (!c || !(ci = c->ci))
 		return;
 
-	if ((ci->flags & CI_VERBOTEN) || (*(c->name) == '+'))
+	if ((ci->flags & CI_FORBIDDEN) || (*(c->name) == '+'))
 		return;
 
 	status = chan_get_user_status(c, user);
diff --git a/src/chanserv.c b/src/chanserv.c
index ee3b96e97..79824a008 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -548,7 +548,7 @@ void load_cs_dbase()
 		ChannelInfo *next;
 		for (ci = chanlists[i]; ci; ci = next) {
 			next = ci->next;
-			if (!(ci->flags & CI_VERBOTEN) && !ci->founder) {
+			if (!(ci->flags & CI_FORBIDDEN) && !ci->founder) {
 				alog("%s: database load: Deleting founderless channel %s",
 					 s_ChanServ, ci->name);
 				delchan(ci);
@@ -883,7 +883,7 @@ int check_valid_admin(User * user, Channel * chan, int servermode)
 	}
 
 	/* They will be kicked; no need to deop, no need to update our internal struct too */
-	if (chan->ci->flags & CI_VERBOTEN)
+	if (chan->ci->flags & CI_FORBIDDEN)
 		return 0;
 
 	if (servermode && !check_access(user, chan->ci, CA_AUTOPROTECT)) {
@@ -915,7 +915,7 @@ int check_valid_op(User * user, Channel * chan, int servermode)
 		return 1;
 
 	/* They will be kicked; no need to deop, no need to update our internal struct too */
-	if (chan->ci->flags & CI_VERBOTEN)
+	if (chan->ci->flags & CI_FORBIDDEN)
 		return 0;
 
 	if (servermode && !check_access(user, chan->ci, CA_AUTOOP)) {
@@ -997,7 +997,7 @@ int check_should_op(User * user, char *chan)
 {
 	ChannelInfo *ci = cs_findchan(chan);
 
-	if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+')
+	if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+')
 		return 0;
 
 	if ((ci->flags & CI_SECURE) && !nick_identified(user))
@@ -1020,7 +1020,7 @@ int check_should_voice(User * user, char *chan)
 {
 	ChannelInfo *ci = cs_findchan(chan);
 
-	if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+')
+	if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+')
 		return 0;
 
 	if ((ci->flags & CI_SECURE) && !nick_identified(user))
@@ -1040,7 +1040,7 @@ int check_should_halfop(User * user, char *chan)
 {
 	ChannelInfo *ci = cs_findchan(chan);
 
-	if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+')
+	if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+')
 		return 0;
 
 	if (check_access(user, ci, CA_AUTOHALFOP)) {
@@ -1058,7 +1058,7 @@ int check_should_owner(User * user, char *chan)
 	char *tmp;
 	ChannelInfo *ci = cs_findchan(chan);
 
-	if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+')
+	if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+')
 		return 0;
 
 	if (((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci))
@@ -1080,7 +1080,7 @@ int check_should_protect(User * user, char *chan)
 	char *tmp;
 	ChannelInfo *ci = cs_findchan(chan);
 
-	if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+')
+	if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+')
 		return 0;
 
 	if (check_access(user, ci, CA_AUTOPROTECT)) {
@@ -1139,7 +1139,7 @@ int check_kick(User * user, const char *chan, time_t chants)
 	if (user->isSuperAdmin == 1)
 		return 0;
 
-	if (ci->flags & CI_SUSPENDED || ci->flags & CI_VERBOTEN)
+	if (ci->flags & CI_SUSPENDED || ci->flags & CI_FORBIDDEN)
 	{
 		get_idealban(ci, user, mask, sizeof(mask));
 		reason = ci->forbidreason ? ci->forbidreason : getstring(user->na, CHAN_MAY_NOT_BE_USED);
@@ -1402,7 +1402,7 @@ void expire_chans()
 			next = ci->next;
 			if (!ci->c && now - ci->last_used >= CSExpire
 				&& !(ci->
-					 flags & (CI_VERBOTEN | CI_NO_EXPIRE | CI_SUSPENDED)))
+					 flags & (CI_FORBIDDEN | CI_NO_EXPIRE | CI_SUSPENDED)))
 			{
 				send_event(EVENT_CHAN_EXPIRE, 1, ci->name);
 				alog("Expiring channel %s (founder: %s)", ci->name,
diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index f37f2d942..533c7f65a 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -35,7 +35,7 @@ class CommandBSAct : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, ci->name);
 			return MOD_CONT;
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index f9927e25d..dc9dca37a 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -55,7 +55,7 @@ class CommandBSAssign : public Command
 			return MOD_CONT;
 		}
 		
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 41050dc93..d51d62517 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -256,7 +256,7 @@ class CommandBSBadwords : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index c6acd204d..917f3e612 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -86,7 +86,7 @@ class CommandBSInfo : public Command
 				notice_lang(s_BotServ, u, PERMISSION_DENIED);
 				return MOD_CONT;
 			}
-			if (ci->flags & CI_VERBOTEN) {
+			if (ci->flags & CI_FORBIDDEN) {
 				notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, query);
 				return MOD_CONT;
 			}
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 8d5688375..49e187fe1 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -42,7 +42,7 @@ class CommandBSKick : public Command
 			syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
 		else if (!(ci = cs_findchan(chan)))
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 		else if (!is_services_admin(u) && !check_access(u, ci, CA_SET))
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index dd995bcc1..2643ff650 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -37,7 +37,7 @@ class CommandBSSay : public Command
 			return MOD_CONT;
 		}
 		
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 9132ed300..73086646d 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -65,7 +65,7 @@ class CommandBSSet : public Command
 			return MOD_CONT;
 		} else if (!(ci = cs_findchan(chan)))
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 		else if (!is_servadmin && !check_access(u, ci, CA_SET))
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index fd8f487a6..bf66b0073 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -34,7 +34,7 @@ class CommandBSUnassign : public Command
 			notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
 		else if (!(ci = cs_findchan(chan)))
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 		else if (!is_services_admin(u) && !check_access(u, ci, CA_ASSIGN))
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index c55bebd84..3adff98d1 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -126,7 +126,7 @@ class CommandCSAccess : public Command
 			syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX);
 		} else if (!(ci = cs_findchan(chan))) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			/* We still allow LIST in xOP mode, but not others */
 		} else if ((ci->flags & CI_XOP) && !is_list) {
@@ -166,7 +166,7 @@ class CommandCSAccess : public Command
 				notice_lang(s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY);
 				return MOD_CONT;
 			}
-			if (na->status & NS_VERBOTEN) {
+			if (na->status & NS_FORBIDDEN) {
 				notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, nick);
 				return MOD_CONT;
 			}
@@ -411,7 +411,7 @@ class CommandCSLevels : public Command
 			syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
 		} else if (!(ci = cs_findchan(chan))) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		} else if (ci->flags & CI_XOP) {
 			notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP);
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 3b43f4692..9eedef49b 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -182,7 +182,7 @@ class CommandCSAKick : public Command
 			syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX);
 		} else if (!(ci = cs_findchan(chan))) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		} else if (ci-> flags & CI_VERBOTEN) {
+		} else if (ci-> flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		} else if (!check_access(u, ci, CA_AKICK) && !is_services_admin(u)) {
 			notice_lang(s_ChanServ, u, ACCESS_DENIED);
@@ -207,7 +207,7 @@ class CommandCSAKick : public Command
 				delete [] user;
 				delete [] host;
 			} else {
-				if (na->status & NS_VERBOTEN) {
+				if (na->status & NS_FORBIDDEN) {
 					notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, mask);
 					return MOD_CONT;
 				}
@@ -253,7 +253,7 @@ class CommandCSAKick : public Command
 				 * or higher access. - Viper */
 				for (i = 0; i < 1024; i++) {
 					for (na2 = nalists[i]; na2; na2 = na2->next) {
-						if (na2->status & NS_VERBOTEN)
+						if (na2->status & NS_FORBIDDEN)
 							continue;
 
 						if (na2->nc && ((na2->nc == ci->founder) || (get_access_nc(na2->nc, ci)
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 9f4ddd023..c72e45ff8 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -64,7 +64,7 @@ class CommandCSBan : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		} else if (!(ci = c->ci)) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		} else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) {
 			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target);
@@ -149,7 +149,7 @@ class CommandCSUnban : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index db90da572..e7dfa2972 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -47,7 +47,7 @@ class CommandCSClear : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		} else if (!(ci = c->ci)) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		} else if (!u || !check_access(u, ci, CA_CLEAR)) {
 			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index b44499f0e..84e72a7a8 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -52,7 +52,7 @@ class CommandCSDrop : public Command
 			return MOD_CONT;
 		}
 
-		if (!is_servadmin && (ci->flags & CI_VERBOTEN))
+		if (!is_servadmin && (ci->flags & CI_FORBIDDEN))
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
@@ -81,7 +81,7 @@ class CommandCSDrop : public Command
 			}
 		}
 
-		if (ircd->chansqline && (ci->flags & CI_VERBOTEN))
+		if (ircd->chansqline && (ci->flags & CI_FORBIDDEN))
 		{
 			ircdproto->SendSQLineDel(ci->name);
 		}
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 936e98a91..382721434 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -80,7 +80,7 @@ class CommandCSForbid : public Command
 			return MOD_CONT;
 		}
 
-		ci->flags |= CI_VERBOTEN;
+		ci->flags |= CI_FORBIDDEN;
 		ci->forbidby = sstrdup(u->nick);
 		if (reason)
 			ci->forbidreason = sstrdup(reason);
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 17659df5d..1546002e0 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -44,7 +44,7 @@ class CommandCSGetKey : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 1dc6aa5dc..060325c82 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -45,7 +45,7 @@ class CommandCSGetPass : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
 			return MOD_CONT;
 		}
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index a9bd1926f..f0f1f439a 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -48,7 +48,7 @@ class CommandCSIdentify : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 8aca84b25..0c3e4303d 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -63,7 +63,7 @@ class CommandCSInfo : public Command
 			return MOD_CONT;
 		}
 
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			if (is_oper(u) && ci->forbidby)
 				notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan,
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index b50716a0c..986d1d815 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -48,7 +48,7 @@ class CommandCSInvite : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
 			return MOD_CONT;
 		}
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index c0b5f8b47..9ba68cdcb 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -58,7 +58,7 @@ class CommandCSKick : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		} else if (!(ci = c->ci)) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		} else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) {
 			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target);
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 505ed8895..0b54f56f2 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -107,7 +107,7 @@ public:
 			while (keywords.GetToken(keyword))
 			{
 				if (stricmp(keyword.c_str(), "FORBIDDEN") == 0)
-					matchflags |= CI_VERBOTEN;
+					matchflags |= CI_FORBIDDEN;
 				if (stricmp(keyword.c_str(), "SUSPENDED") == 0)
 					matchflags |= CI_SUSPENDED;
 				if (stricmp(keyword.c_str(), "NOEXPIRE") == 0)
@@ -126,7 +126,7 @@ public:
 				for (ci = chanlists[i]; ci; ci = ci->next)
 				{
 					if (!is_servadmin && ((ci->flags & CI_PRIVATE)
-					                      || (ci->flags & CI_VERBOTEN)))
+					                      || (ci->flags & CI_FORBIDDEN)))
 						continue;
 					if ((matchflags != 0) && !(ci->flags & matchflags))
 						continue;
@@ -144,7 +144,7 @@ public:
 							if (is_servadmin && (ci->flags & CI_NO_EXPIRE))
 								noexpire_char = '!';
 
-							if (ci->flags & CI_VERBOTEN)
+							if (ci->flags & CI_FORBIDDEN)
 							{
 								snprintf(buf, sizeof(buf),
 								         "%-20s  [Forbidden]", ci->name);
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index f971e6d73..61bdb7ce8 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -76,7 +76,7 @@ class CommandCSLogout : public Command
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
 		}
-		else if (!is_servadmin && (ci->flags & CI_VERBOTEN))
+		else if (!is_servadmin && (ci->flags & CI_FORBIDDEN))
 		{
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		}
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 58d19549e..dbc0bbb24 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -63,7 +63,7 @@ static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const
 		/* Sets the mode to the user on every channels he is on. */
 
 		for (uc = u->chans; uc; uc = uc->next) {
-			if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
+			if ((ci = uc->chan->ci) && !(ci->flags & CI_FORBIDDEN)
 				&& check_access(u, ci, util->levelself)) {
 				ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
 							   util->mode, u->nick);
@@ -87,7 +87,7 @@ static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const
 		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 	} else if (!(ci = c->ci)) {
 		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-	} else if (ci->flags & CI_VERBOTEN) {
+	} else if (ci->flags & CI_FORBIDDEN) {
 		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
 	} else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) {
 		notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
@@ -334,7 +334,7 @@ class CommandCSOwner : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		} else if (!(ci = c->ci)) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
 		} else if (!(u2 = finduser(nick))) {
 			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
@@ -388,7 +388,7 @@ class CommandCSDeOwner : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		} else if (!(ci = c->ci)) {
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-		} else if (ci->flags & CI_VERBOTEN) {
+		} else if (ci->flags & CI_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
 		} else if (!(u2 = finduser(nick))) {
 			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 790b17807..c932ce426 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -63,7 +63,7 @@ class CommandCSRegister : public Command
 			notice_lang(s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan);
 		else if ((ci = cs_findchan(chan)))
 		{
-			if (ci->flags & CI_VERBOTEN)
+			if (ci->flags & CI_FORBIDDEN)
 			{
 				alog("%s: Attempt to register FORBIDden channel %s by %s!%s@%s", s_ChanServ, ci->name, u->nick, u->GetIdent().c_str(), u->host);
 				notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index c41d35f2a..16990415b 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -34,7 +34,7 @@ class CommandCSSendPass : public Command
 			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
 		else if (!(ci = cs_findchan(chan)) || !(founder = ci->founder))
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		else
 		{
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 6b6e26ffd..f1976f0d9 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -155,7 +155,7 @@ int do_set(User * u)
 		syntax_error(s_ChanServ, u, "SET", CHAN_SET_SYNTAX);
 	} else if (!(ci = cs_findchan(chan))) {
 		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-	} else if (ci->flags & CI_VERBOTEN) {
+	} else if (ci->flags & CI_FORBIDDEN) {
 		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 	} else if (!is_servadmin && !check_access(u, ci, CA_SET)) {
 		notice_lang(s_ChanServ, u, ACCESS_DENIED);
@@ -256,7 +256,7 @@ int do_set_founder(User * u, ChannelInfo * ci, char *param)
 	if (!na) {
 		notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param);
 		return MOD_CONT;
-	} else if (na->status & NS_VERBOTEN) {
+	} else if (na->status & NS_FORBIDDEN) {
 		notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param);
 		return MOD_CONT;
 	}
@@ -297,7 +297,7 @@ int do_set_successor(User * u, ChannelInfo * ci, char *param)
 			notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param);
 			return MOD_CONT;
 		}
-		if (na->status & NS_VERBOTEN) {
+		if (na->status & NS_FORBIDDEN) {
 			notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param);
 			return MOD_CONT;
 		}
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index bac04bd10..d1c24b521 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -42,7 +42,7 @@ class CommandCSStatus : public Command
 		}
 		if (!ci)
 			notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_ChanServ, u, CHAN_STATUS_FORBIDDEN, chan);
 		else if ((u2 = finduser(nick)))
 			notice_lang(s_ChanServ, u, CHAN_STATUS_INFO, chan, nick, get_access(u2, ci));
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 1cee2f9bc..a6d248801 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -53,7 +53,7 @@ class CommandCSSuspend : public Command
 		}
 
 		/* You should not SUSPEND a FORBIDEN channel */
-		if (ci->flags & CI_VERBOTEN)
+		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
 			return MOD_CONT;
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index 28b28776f..6a5af3dec 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -36,7 +36,7 @@ class CommandCSTopic : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		else if (!(ci = c->ci))
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
 		else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC))
 			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 38efba609..eea75018b 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -135,7 +135,7 @@ class XOPBase : public Command
 			notice_lang(s_ChanServ, u, messages[XOP_NICKS_ONLY]);
 			return MOD_CONT;
 		}
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 		{
 			notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, na->nick);
 			return MOD_CONT;
@@ -409,7 +409,7 @@ class XOPBase : public Command
 
 		if (!(ci = cs_findchan(chan)))
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
 		else if (!(ci->flags & CI_XOP))
 			notice_lang(s_ChanServ, u, CHAN_XOP_ACCESS, s_ChanServ);
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index 2e80bf77e..3318d0ba6 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -30,7 +30,7 @@ class CommandHSDel : public Command
 		const char *nick = params[0].c_str();
 		if ((na = findnick(nick)))
 		{
-			if (na->status & NS_VERBOTEN)
+			if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
 				return MOD_CONT;
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index cfce2fdf5..a373ef487 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -32,7 +32,7 @@ class CommandHSDelAll : public Command
 		NickCore *nc;
 		if ((na = findnick(nick)))
 		{
-			if (na->status & NS_VERBOTEN)
+			if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
 				return MOD_CONT;
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 49b22b3c7..0a63923ba 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -109,7 +109,7 @@ class CommandHSSet : public Command
 
 		if ((na = findnick(nick)))
 		{
-			if (na->status & NS_VERBOTEN)
+			if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
 				if (vIdent)
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 2124deda2..09f63c12f 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -110,7 +110,7 @@ class CommandHSSetAll : public Command
 
 		if ((na = findnick(nick)))
 		{
-			if (na->status & NS_VERBOTEN)
+			if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
 				if (vIdent) {
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index 7f13db617..477ec1517 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -44,7 +44,7 @@ class CommandMSCheck : public Command
 			return MOD_CONT;
 		}
 
-		if ((na->status & NS_VERBOTEN))
+		if ((na->status & NS_FORBIDDEN))
 		{
 			notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, recipient);
 			return MOD_CONT;
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index 58c7bf2c1..61188e18b 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -48,7 +48,7 @@ class CommandMSDel : public Command
 				notice_lang(s_MemoServ, u, READ_ONLY_MODE);
 				return MOD_CONT;
 			}
-			else if (ci->flags & CI_VERBOTEN)
+			else if (ci->flags & CI_FORBIDDEN)
 			{
 				notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
 				return MOD_CONT;
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index a2ef38a4d..96dd9f751 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -41,7 +41,7 @@ class CommandMSInfo : public Command
 				notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, name);
 				return MOD_CONT;
 			}
-			else if (na->status & NS_VERBOTEN)
+			else if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, name);
 				return MOD_CONT;
@@ -57,7 +57,7 @@ class CommandMSInfo : public Command
 				notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, name);
 				return MOD_CONT;
 			}
-			else if (ci->flags & CI_VERBOTEN)
+			else if (ci->flags & CI_FORBIDDEN)
 			{
 				notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, name);
 				return MOD_CONT;
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 1d02d4258..d8153593a 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -43,7 +43,7 @@ class CommandMSList : public Command
 				notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
 				return MOD_CONT;
 			}
-			else if (ci->flags & CI_VERBOTEN)
+			else if (ci->flags & CI_FORBIDDEN)
 			{
 				notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
 				return MOD_CONT;
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 27ed0931b..b3046fa3f 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -43,7 +43,7 @@ class CommandMSRead : public Command
 				notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
 				return MOD_CONT;
 			}
-			else if (ci->flags & CI_VERBOTEN)
+			else if (ci->flags & CI_FORBIDDEN)
 			{
 				notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
 				return MOD_CONT;
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index ca12163de..c086da58d 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -88,7 +88,7 @@ class CommandMSSet : public Command
 				notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
 				return MOD_CONT;
 			}
-			else if (ci->flags & CI_VERBOTEN)
+			else if (ci->flags & CI_FORBIDDEN)
 			{
 				notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
 				return MOD_CONT;
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index cbca3a989..6ccf31d94 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -32,7 +32,7 @@ class CommandNSAccess : public Command
 			return MOD_CONT;
 		}
 
-		if (na->status & NS_VERBOTEN)
+		if (na->status & NS_FORBIDDEN)
 		{
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 			return MOD_CONT;
@@ -170,7 +170,7 @@ class CommandNSAccess : public Command
 		}
 		else if (!(na = u->na))
 			notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index c2e59a978..985948442 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -87,7 +87,7 @@ class CommandNSAList : public Command
 			notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
 		else if (is_servadmin && nick && !na)
 			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (min_level <= ACCESS_INVALID || min_level > ACCESS_FOUNDER)
 			notice_lang(s_NickServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 460a9fb93..62b09ec4d 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -76,7 +76,7 @@ class CommandNSDrop : public Command
 			if (readonly)
 				notice_lang(s_NickServ, u, READ_ONLY_MODE);
 
-			if (ircd->sqline && (na->status & NS_VERBOTEN))
+			if (ircd->sqline && (na->status & NS_FORBIDDEN))
 				ircdproto->SendSQLineDel(na->nick);
 
 			alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, na->nick, na->nc->display, na->nc->email ? na->nc->email : "none");
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 9abe8fe81..53268916f 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -56,7 +56,7 @@ class CommandNSForbid : public Command
 		na = makenick(nick);
 		if (na)
 		{
-			na->status |= NS_VERBOTEN;
+			na->status |= NS_FORBIDDEN;
 			na->last_usermask = sstrdup(u->nick);
 			if (reason)
 				na->last_realname = sstrdup(reason);
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 381d8b36f..cb6a49748 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -43,7 +43,7 @@ class CommandNSGetPass : public Command
 			else
 				notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
 		}
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (NSSecureAdmins && nick_is_services_admin(na->nc) && !is_services_root(u))
 			notice_lang(s_NickServ, u, PERMISSION_DENIED);
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 840615da8..85769dc3a 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -35,7 +35,7 @@ class CommandNSGhost : public Command
 			notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
 		else if (!(na = u2->na))
 			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 724329327..816a163fa 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -92,7 +92,7 @@ class CommandNSGroup : public Command
 			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
 		else if (time(NULL) < u->lastnickreg + NSRegDelay)
 			notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, NSRegDelay);
-		else if (u->na && (u->na->status & NS_VERBOTEN))
+		else if (u->na && (u->na->status & NS_FORBIDDEN))
 		{
 			alog("%s: %s@%s tried to use GROUP from FORBIDden nick %s", s_NickServ, u->GetIdent().c_str(), u->host, u->nick);
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
@@ -111,7 +111,7 @@ class CommandNSGroup : public Command
 			alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, target->nick);
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, target->nick);
 		}
-		else if (target->status & NS_VERBOTEN)
+		else if (target->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
 		else if (u->na && target->nc == u->na->nc)
 			notice_lang(s_NickServ, u, NICK_GROUP_SAME, target->nick);
@@ -231,7 +231,7 @@ class CommandNSGList : public Command
 			notice_lang(s_NickServ, u, nick_ided ? ACCESS_DENIED : NICK_IDENTIFY_REQUIRED, s_NickServ);
 		else if (!nick ? !(na = u->na) : !(na = findnick(nick)))
 			notice_lang(s_NickServ, u, !nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else
 		{
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 76940f475..f44b2c715 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -44,7 +44,7 @@ class CommandNSIdentify : public Command
 			else
 				notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
 		}
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index ea903a0e7..dc91a881b 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -71,7 +71,7 @@ class CommandNSInfo : public Command
 			else
 				notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
 		}
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 		{
 			if (is_oper(u) && na->last_usermask)
 				notice_lang(s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick, na->last_usermask, na->last_realname ? na->last_realname : getstring(u->na, NO_REASON));
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 239b596e9..389fdaba9 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -26,7 +26,7 @@ class CommandNSList : public Command
 
 	CommandResult Execute(User *u, std::vector<std::string> &params)
 	{
-		/* SADMINS can search for nicks based on their NS_VERBOTEN and NS_NO_EXPIRE
+		/* SADMINS can search for nicks based on their NS_FORBIDDEN and NS_NO_EXPIRE
 		 * status. The keywords FORBIDDEN and NOEXPIRE represent these two states
 		 * respectively. These keywords should be included after the search pattern.
 		 * Multiple keywords are accepted and should be separated by spaces. Only one
@@ -109,7 +109,7 @@ class CommandNSList : public Command
 			while (keywords.GetString(keyword))
 			{
 				if (!stricmp(keyword.c_str(), "FORBIDDEN"))
-					matchflags |= NS_VERBOTEN;
+					matchflags |= NS_FORBIDDEN;
 				if (!stricmp(keyword.c_str(), "NOEXPIRE"))
 					matchflags |= NS_NO_EXPIRE;
 				if (!stricmp(keyword.c_str(), "SUSPENDED"))
@@ -129,7 +129,7 @@ class CommandNSList : public Command
 				for (na = nalists[i]; na; na = na->next)
 				{
 					/* Don't show private and forbidden nicks to non-services admins. */
-					if ((na->status & NS_VERBOTEN) && !is_servadmin)
+					if ((na->status & NS_FORBIDDEN) && !is_servadmin)
 						continue;
 					if ((na->nc->flags & NI_PRIVATE) && !is_servadmin && na->nc != mync)
 						continue;
@@ -141,7 +141,7 @@ class CommandNSList : public Command
 					/* We no longer compare the pattern against the output buffer.
 					 * Instead we build a nice nick!user@host buffer to compare.
 					 * The output is then generated separately. -TheShadow */
-					snprintf(buf, sizeof(buf), "%s!%s", na->nick, na->last_usermask && !(na->status & NS_VERBOTEN) ? na->last_usermask : "*@*");
+					snprintf(buf, sizeof(buf), "%s!%s", na->nick, na->last_usermask && !(na->status & NS_FORBIDDEN) ? na->last_usermask : "*@*");
 					if (!stricmp(pattern, na->nick) || match_wild_nocase(pattern, buf))
 					{
 						if (((count + 1 >= from && count + 1 <= to) || (!from && !to)) && ++nnicks <= NSListMax)
@@ -152,7 +152,7 @@ class CommandNSList : public Command
 								noexpire_char = ' ';
 							if ((na->nc->flags & NI_HIDE_MASK) && !is_servadmin && na->nc != mync)
 								snprintf(buf, sizeof(buf), "%-20s  [Hostname Hidden]", na->nick);
-							else if (na->status & NS_VERBOTEN)
+							else if (na->status & NS_FORBIDDEN)
 								snprintf(buf, sizeof(buf), "%-20s  [Forbidden]", na->nick);
 							else if (na->nc->flags & NI_SUSPENDED)
 								snprintf(buf, sizeof(buf), "%-20s  [Suspended]", na->nick);
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 2afca939e..8ad8e7205 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -44,7 +44,7 @@ class CommandNSLogout : public Command
 			else
 				notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
 		}
-		else if (u2->na->status & NS_VERBOTEN)
+		else if (u2->na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u2->na->nick);
 		else if (!nick && !nick_identified(u))
 			notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 95df90c7b..515754eb3 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -35,7 +35,7 @@ class CommandNSRecover : public Command
 			notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
 		else if (!(na = u2->na))
 			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 73ea39f6b..ac601ec71 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -324,7 +324,7 @@ class CommandNSRegister : public CommandNSConfirm
 			notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, NSRegDelay);
 		else if (u->na) /* i.e. there's already such a nick regged */
 		{
-			if (u->na->status & NS_VERBOTEN)
+			if (u->na->status & NS_FORBIDDEN)
 			{
 				alog("%s: %s@%s tried to register FORBIDden nick %s", s_NickServ, u->GetIdent().c_str(), u->host, u->nick);
 				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 5ac5861a2..37a0b0d16 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -32,7 +32,7 @@ class CommandNSRelease : public Command
 
 		if (!(na = findnick(nick)))
 			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 0747c658c..7309fe733 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -502,7 +502,7 @@ class CommandNSSASet : public Command
 			return MOD_CONT;
 		}
 
-		if (na->status & NS_VERBOTEN)
+		if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 37238daf8..70009a149 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -33,7 +33,7 @@ class CommandNSSendPass : public Command
 			notice_lang(s_NickServ, u, PERMISSION_DENIED);
 		else if (!(na = findnick(nick)))
 			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else
 		{
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 2023ed416..47c66efa8 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -465,7 +465,7 @@ class CommandNSSet : public Command
 
 		if (!na)
 			notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-		else if (na->status & NS_VERBOTEN)
+		else if (na->status & NS_FORBIDDEN)
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 		else if (na->nc->flags & NI_SUSPENDED)
 			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index f5cfa5d88..62146497c 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -43,7 +43,7 @@ class CommandNSSuspend : public Command
 			return MOD_CONT;
 		}
 
-		if (na->status & NS_VERBOTEN)
+		if (na->status & NS_FORBIDDEN)
 		{
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 			return MOD_CONT;
@@ -125,7 +125,7 @@ class CommandNSUnSuspend : public Command
 			return MOD_CONT;
 		}
 
-		if (na->status & NS_VERBOTEN)
+		if (na->status & NS_FORBIDDEN)
 		{
 			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
 			return MOD_CONT;
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index 91b5b8f4b..955751629 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -45,7 +45,7 @@ class CommandOSAdmin : public Command
 			return MOD_CONT;
 		}
 
-		if (na->status & NS_VERBOTEN)
+		if (na->status & NS_FORBIDDEN)
 		{
 			notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
 			return MOD_CONT;
@@ -129,7 +129,7 @@ class CommandOSAdmin : public Command
 				return MOD_CONT;
 			}
 
-			if (na->status & NS_VERBOTEN)
+			if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
 				return MOD_CONT;
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index be02265e4..92b6b21cb 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -46,7 +46,7 @@ class CommandOSOper : public Command
 			return MOD_CONT;
 		}
 
-		if (na->status & NS_VERBOTEN)
+		if (na->status & NS_FORBIDDEN)
 		{
 			notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
 			return MOD_CONT;
@@ -130,7 +130,7 @@ class CommandOSOper : public Command
 				return MOD_CONT;
 			}
 
-			if (na->status & NS_VERBOTEN)
+			if (na->status & NS_FORBIDDEN)
 			{
 				notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
 				return MOD_CONT;
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index bb4e67695..28ef6f593 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -66,7 +66,7 @@ class CommandOSSVSNick : public Command
 			notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
 		else if (finduser(newnick))
 			notice_lang(s_OperServ, u, NICK_X_IN_USE, newnick);
-		else if ((na = findnick(newnick)) && (na->status & NS_VERBOTEN))
+		else if ((na = findnick(newnick)) && (na->status & NS_FORBIDDEN))
 			notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, newnick);
 		else
 		{
diff --git a/src/memoserv.c b/src/memoserv.c
index c7488540f..93aec75ac 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -148,7 +148,7 @@ MemoInfo *getmemoinfo(const char *name, int *ischan, int *isforbid)
 			*ischan = 1;
 		ci = cs_findchan(name);
 		if (ci) {
-			if (!(ci->flags & CI_VERBOTEN)) {
+			if (!(ci->flags & CI_FORBIDDEN)) {
 				*isforbid = 0;
 				return &ci->memos;
 			} else {
@@ -165,7 +165,7 @@ MemoInfo *getmemoinfo(const char *name, int *ischan, int *isforbid)
 			*ischan = 0;
 		na = findnick(name);
 		if (na) {
-			if (!(na->status & NS_VERBOTEN)) {
+			if (!(na->status & NS_FORBIDDEN)) {
 				*isforbid = 0;
 				return &na->nc->memos;
 			} else {
diff --git a/src/messages.c b/src/messages.c
index 55b4fa283..83f1dd338 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -131,7 +131,7 @@ int m_privmsg(const char *source, const char *receiver, const char *msg)
 	if (*receiver == '#') {
 		if (s_BotServ && (ci = cs_findchan(receiver))) {
 			/* Some paranoia checks */
-			if (!(ci->flags & CI_VERBOTEN) && ci->c && ci->bi) {
+			if (!(ci->flags & CI_FORBIDDEN) && ci->c && ci->bi) {
 				botchanmsgs(u, ci, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX
 			}
 		}
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 6aac5a1e1..67526348a 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -71,7 +71,7 @@ class CommandCSAppendTopic : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		else if (!(ci = c->ci))
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
 		else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC))
 			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 19ff90b2b..058db9aca 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -183,7 +183,7 @@ class CommandCSEnforce : public Command
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
 		else if (!(ci = c->ci))
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-		else if (ci->flags & CI_VERBOTEN)
+		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
 		else if (!is_services_admin(u) && !check_access(u, ci, CA_AKICK))
 			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 4b7994bfc..d8834c156 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -210,7 +210,7 @@ int canBanUser(Channel * c, User * u, User * u2)
 	int ok = 0;
 	if (!(ci = c->ci))
 		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-	else if (ci->flags & CI_VERBOTEN)
+	else if (ci->flags & CI_FORBIDDEN)
 		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, c->name);
 	else if (!check_access(u, ci, CA_BAN))
 		notice_lang(s_ChanServ, u, ACCESS_DENIED);
diff --git a/src/nickserv.c b/src/nickserv.c
index 0bf328151..035fc5864 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -320,7 +320,7 @@ void load_ns_dbase()
 
 			slist_add(&na->nc->aliases, na);
 
-			if (!(na->status & NS_VERBOTEN)) {
+			if (!(na->status & NS_FORBIDDEN)) {
 				if (!na->last_usermask)
 					na->last_usermask = sstrdup("");
 				if (!na->last_realname)
@@ -508,7 +508,7 @@ int validate_user(User * u)
 	if (!(na = u->na))
 		return 0;
 
-	if (na->status & NS_VERBOTEN) {
+	if (na->status & NS_FORBIDDEN) {
 		notice_lang(s_NickServ, u, NICK_MAY_NOT_BE_USED);
 		collide(na, 0);
 		return 0;
@@ -676,7 +676,7 @@ void expire_nicks()
 			}
 
 			if (NSExpire && now - na->last_seen >= NSExpire
-				&& !(na->status & (NS_VERBOTEN | NS_NO_EXPIRE))
+				&& !(na->status & (NS_FORBIDDEN | NS_NO_EXPIRE))
 				&& !(na->nc->flags & (NI_SUSPENDED))) {
 				alog("Expiring nickname %s (group: %s) (e-mail: %s)",
 					 na->nick, na->nc->display,
@@ -1418,7 +1418,7 @@ int nsCheckNickTracking(User * u)
 	}
 
 	/* nick is forbidden best return 0 */
-	if (na->status & NS_VERBOTEN) {
+	if (na->status & NS_FORBIDDEN) {
 		return 0;
 	}
 
diff --git a/src/servers.c b/src/servers.c
index c448e4744..3525c2826 100644
--- a/src/servers.c
+++ b/src/servers.c
@@ -205,7 +205,7 @@ static void delete_server(Server * serv, const char *quitreason)
 			while (u) {
 				unext = nextuser();
 				if (u->server == serv) {
-					if ((na = u->na) && !(na->status & NS_VERBOTEN)
+					if ((na = u->na) && !(na->status & NS_FORBIDDEN)
 						&& (!(na->nc->flags & NI_SUSPENDED))
 						&& (na->status & (NS_IDENTIFIED | NS_RECOGNIZED))) {
 						na->last_seen = time(NULL);
diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c
index 5f62b614f..23170e5fb 100644
--- a/src/tools/db-convert.c
+++ b/src/tools/db-convert.c
@@ -463,7 +463,7 @@ int main(int argc, char *argv[])
 					na->nc->flags |= 0x00100000;
 				}
 
-				// Convert nick VERBOTEN to group FORBIDDEN
+				// Convert nick FORBIDDEN to group FORBIDDEN
 				if (na->status & 0x0002)
 				{
 					na->nc->flags |= 0x80000000;
diff --git a/src/users.c b/src/users.c
index 35d4b6635..364d3bdc0 100644
--- a/src/users.c
+++ b/src/users.c
@@ -834,7 +834,7 @@ void do_quit(const char *source, int ac, const char **av)
 	if (debug) {
 		alog("debug: %s quits", source);
 	}
-	if ((na = user->na) && (!(na->status & NS_VERBOTEN))
+	if ((na = user->na) && (!(na->status & NS_FORBIDDEN))
 		&& (!(na->nc->flags & NI_SUSPENDED))
 		&& (na->status & (NS_IDENTIFIED | NS_RECOGNIZED))) {
 		na->last_seen = time(NULL);
@@ -870,7 +870,7 @@ void do_kill(const char *nick, const char *msg)
 	if (debug) {
 		alog("debug: %s killed", nick);
 	}
-	if ((na = user->na) && (!(na->status & NS_VERBOTEN))
+	if ((na = user->na) && (!(na->status & NS_FORBIDDEN))
 		&& (!(na->nc->flags & NI_SUSPENDED))
 		&& (na->status & (NS_IDENTIFIED | NS_RECOGNIZED))) {
 		na->last_seen = time(NULL);