diff --git a/include/struct.h b/include/struct.h
index 43e4c335d..aa526744a 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1355,7 +1355,7 @@ struct LocalClient {
 	u_char targets[MAXCCUSERS];	/**< Hash values of targets for target limiting */
 	ConfigItem_listen *listener;	/**< If this client IsListening() then this is the listener configuration attached to it */
 	long serial;			/**< Current serial number for send.c functions (to avoid sending duplicate messages) */
-	time_t nextnick;		/**< Time the next nick change will be allowed */
+	time_t next_nick_allowed;		/**< Time the next nick change will be allowed */
 	time_t idle_since;		/**< Last time a RESETIDLE message was received (PRIVMSG) */
 	long sendM;			/**< Statistics: protocol messages send */
 	long sendK;			/**< Statistics: total k-bytes send */
diff --git a/src/ircd.c b/src/ircd.c
index fa9796c59..b6ad89a98 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -527,8 +527,8 @@ void fix_timers(void)
 		/* users */
 		if (MyUser(client))
 		{
-			if (client->local->nextnick > TStime())
-				client->local->nextnick = TStime();
+			if (client->local->next_nick_allowed > TStime())
+				client->local->next_nick_allowed = TStime();
 			if (client->local->nexttarget > TStime())
 				client->local->nexttarget = TStime();
 		}