diff --git a/data/pics/kvi_bigicon_nictdepopup.png b/data/pics/kvi_bigicon_nickpopup.png
similarity index 100%
rename from data/pics/kvi_bigicon_nictdepopup.png
rename to data/pics/kvi_bigicon_nickpopup.png
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 1c64dc9..8a66430 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -834,7 +834,7 @@ KviChangeNickAction::KviChangeNickAction(TQObject * pParent)
 	__tr2qs("Change Nickname"),
 	__tr2qs("Shows a popup menu that allows quickly changing the nickname"),
 	KviActionManager::categoryIrc(),
-	"kvi_bigicon_nictdepopup.png",
+	"kvi_bigicon_nickpopup.png",
 	KVI_SMALLICON_NICK,
 	NeedsConnection | NeedsContext)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index 17f0d8c..dc230b3 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -199,7 +199,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnIRC",""),
 	/*
-		@doc: onchannelnictdepopuprequest
+		@doc: onchannelnickpopuprequest
 		@type:
 			event
 		@title:
@@ -236,7 +236,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			Channel window
 		@description:
 		@seealso:
-			[event:onchannelnictdepopuprequest]OnChannelNickPopupRequest[/event]
+			[event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event]
 	*/
 	EVENT("OnChannelNickDefaultActionRequest","$0 = nick list"),
 	/*
@@ -534,13 +534,13 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			that can be performed with the nickname like querying , sending a file by dcc or opening a dcc.chat.
 			Please note that NOT ALL the nickname links will receive this event.[br]
 			The nickname links that appear in the text view of the channel that they are actually in
-			are handled by the [event:onchannelnictdepopuprequest]OnChannelNickPopupRequest[/event] event.[br]
+			are handled by the [event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event] event.[br]
 			The nickname links that appear in the text view of the query in that they are a remote end
-			are handled by the [event:onquerynictdepopuprequest]OnQueryNickPopupRequest[/event] event.[br]
+			are handled by the [event:onquerynickpopuprequest]OnQueryNickPopupRequest[/event] event.[br]
 	*/
 	EVENT("OnNickLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
 	/*
-		@doc: onquerynictdepopuprequest
+		@doc: onquerynickpopuprequest
 		@type:
 			event
 		@title: