34 files changed, 133 insertions, 201 deletions
diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc
index ab7173bb2b..1e7b53a7de 100644
--- a/protocols/Tlen/res/tlen.rc
+++ b/protocols/Tlen/res/tlen.rc
@@ -198,7 +198,7 @@ END
 IDD_PASSWORD DIALOG DISCARDABLE  0, 0, 151, 63
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
     WS_VISIBLE | WS_CAPTION
-CAPTION "Jabber Password"
+CAPTION "Tlen Password"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_JID,7,7,137,12,ES_READONLY | NOT WS_BORDER | NOT
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index d03ad838b1..1206d4016c 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -21,12 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "commons.h"
-#include "jabber.h"
+#include "tlen.h"
 #include "tlen_muc.h"
 #include "tlen_file.h"
 #include "tlen_voice.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
 #include "resource.h"
 #include "tlen_picture.h"
 #include <richedit.h>
@@ -53,7 +53,7 @@ PLUGININFOEX pluginInfoEx = {
 	{0x748f8934, 0x781a, 0x528d, { 0x52, 0x08, 0x00, 0x12, 0x65, 0x40, 0x4a, 0xb3 }}
 };
 
-// Main jabber server connection thread global variables
+// Main tlen server connection thread global variables
 
 BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpvReserved)
 {
@@ -137,7 +137,7 @@ int TlenProtocol::PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int TlenProtocol::ContactMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::ContactMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)
 {
 	HANDLE hContact = (HANDLE)wParam;
 	if (hContact != NULL && isOnline) {
@@ -150,7 +150,7 @@ int TlenProtocol::ContactMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int TlenProtocol::ContactMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::ContactMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)
 {
 	HANDLE hContact = (HANDLE)wParam;
 	if (hContact != NULL && isOnline) {
@@ -163,7 +163,7 @@ int TlenProtocol::ContactMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int TlenProtocol::ContactMenuHandleSendPicture(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::ContactMenuHandleSendPicture(WPARAM wParam, LPARAM lParam)
 {
 	HANDLE hContact = (HANDLE)wParam;
 	if (hContact != NULL && isOnline)
@@ -172,7 +172,7 @@ int TlenProtocol::ContactMenuHandleSendPicture(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam)
 {
 	char szFileName[ MAX_PATH ];
 	DBVARIANT dbv;
diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/tlen.h
index e8cd777b74..c2caef4230 100644
--- a/protocols/Tlen/src/jabber.h
+++ b/protocols/Tlen/src/tlen.h
@@ -83,7 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_avatars.h>
 #include <m_nudge.h>
 
-#include "jabber_xml.h"
+#include "tlen_xml.h"
 #include "crypto/polarssl/aes.h"
 #include "crypto/polarssl/bignum.h"
 
diff --git a/protocols/Tlen/src/tlen_advsearch.cpp b/protocols/Tlen/src/tlen_advsearch.cpp
index 5a338a3bd6..92611ac126 100644
--- a/protocols/Tlen/src/tlen_advsearch.cpp
+++ b/protocols/Tlen/src/tlen_advsearch.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include "resource.h"
 
 static void InitComboBox(HWND hwndCombo, JABBER_FIELD_MAP *fieldMap)
diff --git a/protocols/Tlen/src/tlen_avatar.cpp b/protocols/Tlen/src/tlen_avatar.cpp
index 340be5869c..a55c0321f0 100644
--- a/protocols/Tlen/src/tlen_avatar.cpp
+++ b/protocols/Tlen/src/tlen_avatar.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 #include "tlen_avatar.h"
 #include <stdio.h>
 #include <io.h>
diff --git a/protocols/Tlen/src/tlen_file.cpp b/protocols/Tlen/src/tlen_file.cpp
index d45b2b014f..81bbbf298f 100644
--- a/protocols/Tlen/src/tlen_file.cpp
+++ b/protocols/Tlen/src/tlen_file.cpp
@@ -19,12 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include <io.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
 #include "tlen_p2p_old.h"
 
 static void TlenFileReceiveParse(TLEN_FILE_TRANSFER *ft)
diff --git a/protocols/Tlen/src/tlen_file.h b/protocols/Tlen/src/tlen_file.h
index 1cd0704ea5..170c1b75ec 100644
--- a/protocols/Tlen/src/tlen_file.h
+++ b/protocols/Tlen/src/tlen_file.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _TLEN_FILE_H_
 
 #include <windows.h>
-#include "jabber.h"
+#include "tlen.h"
 
 extern int TlenFileCancelAll(TlenProtocol *proto);
 extern void TlenProcessF(XmlNode *node, ThreadData *userdata);
diff --git a/protocols/Tlen/src/jabber_iq.cpp b/protocols/Tlen/src/tlen_iq.cpp
index 01ce67129b..2b3431165e 100644
--- a/protocols/Tlen/src/jabber_iq.cpp
+++ b/protocols/Tlen/src/tlen_iq.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_iq.h"
+#include "tlen.h"
+#include "tlen_iq.h"
 
 
 void JabberIqInit(TlenProtocol *proto)
diff --git a/protocols/Tlen/src/jabber_iq.h b/protocols/Tlen/src/tlen_iq.h
index d521c85c66..35be984430 100644
--- a/protocols/Tlen/src/jabber_iq.h
+++ b/protocols/Tlen/src/tlen_iq.h
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef _JABBER_IQ_H_
 #define _JABBER_IQ_H_
 
-#include "jabber_xml.h"
-#include "jabber.h"
+#include "tlen_xml.h"
+#include "tlen.h"
 
 typedef void (*JABBER_IQ_PFUNC)(TlenProtocol *proto, XmlNode *iqNode);
 
diff --git a/protocols/Tlen/src/jabber_iqid.cpp b/protocols/Tlen/src/tlen_iqid.cpp
index 3a6cb87ec5..87893e2fc5 100644
--- a/protocols/Tlen/src/jabber_iqid.cpp
+++ b/protocols/Tlen/src/tlen_iqid.cpp
@@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include "resource.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
 #include "tlen_muc.h"
 
 void JabberIqResultAuth(TlenProtocol *proto, XmlNode *iqNode)
diff --git a/protocols/Tlen/src/jabber_list.cpp b/protocols/Tlen/src/tlen_list.cpp
index de9fe21c78..7010a8e101 100644
--- a/protocols/Tlen/src/jabber_list.cpp
+++ b/protocols/Tlen/src/tlen_list.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 
 
 static void JabberListFreeItemInternal(JABBER_LIST_ITEM *item);
diff --git a/protocols/Tlen/src/jabber_list.h b/protocols/Tlen/src/tlen_list.h
index 30eb1abbdb..80b294e459 100644
--- a/protocols/Tlen/src/jabber_list.h
+++ b/protocols/Tlen/src/tlen_list.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 
 #ifndef _JABBER_LIST_H_
 #define _JABBER_LIST_H_
diff --git a/protocols/Tlen/src/jabber_misc.cpp b/protocols/Tlen/src/tlen_misc.cpp
index 631a6d7e99..f90bf62509 100644
--- a/protocols/Tlen/src/jabber_misc.cpp
+++ b/protocols/Tlen/src/tlen_misc.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 
 void JabberDBAddEvent(TlenProtocol *proto, HANDLE hContact, int eventType, DWORD flags, PBYTE pBlob, DWORD cbBlob)
 {
diff --git a/protocols/Tlen/src/tlen_muc.cpp b/protocols/Tlen/src/tlen_muc.cpp
index fbf72e8ee6..393a19be27 100644
--- a/protocols/Tlen/src/tlen_muc.cpp
+++ b/protocols/Tlen/src/tlen_muc.cpp
@@ -19,9 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
 #include "resource.h"
 #include "tlen_muc.h"
 
@@ -1000,7 +1000,7 @@ static int TlenMUCQueryContacts(TlenProtocol *proto, const char *roomId) {
 	return 1;
 }
 
-int TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam)
 {
 	if (!isOnline)
 		return 1;
@@ -1009,7 +1009,7 @@ int TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int TlenProtocol::MUCMenuHandleChats(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MUCMenuHandleChats(WPARAM wParam, LPARAM lParam)
 {
 	if (!isOnline)
 		return 1;
@@ -1023,7 +1023,7 @@ int TlenProtocol::MUCMenuHandleChats(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM lParam)
 {
 	HANDLE hContact;
 	DBVARIANT dbv;
diff --git a/protocols/Tlen/src/jabber_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp
index f73ac40f68..4c0be5e564 100644
--- a/protocols/Tlen/src/jabber_opt.cpp
+++ b/protocols/Tlen/src/tlen_opt.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 #include "tlen_voice.h"
 #include <commctrl.h>
 #include "resource.h"
diff --git a/protocols/Tlen/src/tlen_p2p_new.cpp b/protocols/Tlen/src/tlen_p2p_new.cpp
index 70ec288959..c09a1f61ba 100644
--- a/protocols/Tlen/src/tlen_p2p_new.cpp
+++ b/protocols/Tlen/src/tlen_p2p_new.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
 
 
 static void logInfo(const char *filename, const char *fmt, ...) {
diff --git a/protocols/Tlen/src/tlen_p2p_old.cpp b/protocols/Tlen/src/tlen_p2p_old.cpp
index da6217abbc..1f51178bd1 100644
--- a/protocols/Tlen/src/tlen_p2p_old.cpp
+++ b/protocols/Tlen/src/tlen_p2p_old.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
 
 
 void TlenP2PFreeFileTransfer(TLEN_FILE_TRANSFER *ft)
diff --git a/protocols/Tlen/src/tlen_p2p_old.h b/protocols/Tlen/src/tlen_p2p_old.h
index 4e2305310f..620d091351 100644
--- a/protocols/Tlen/src/tlen_p2p_old.h
+++ b/protocols/Tlen/src/tlen_p2p_old.h
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 
 #ifndef _TLEN_P2P_OLD_H_
 #define _TLEN_P2P_OLD_H_
diff --git a/protocols/Tlen/src/tlen_picture.cpp b/protocols/Tlen/src/tlen_picture.cpp
index 55c4a1c07d..407eb6067d 100644
--- a/protocols/Tlen/src/tlen_picture.cpp
+++ b/protocols/Tlen/src/tlen_picture.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 #include "tlen_file.h"
 #include "tlen_p2p_old.h"
 
diff --git a/protocols/Tlen/src/tlen_picture.h b/protocols/Tlen/src/tlen_picture.h
index ef98b02405..178134007d 100644
--- a/protocols/Tlen/src/tlen_picture.h
+++ b/protocols/Tlen/src/tlen_picture.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define	_TLEN_PICTURE_H
 
 #include <windows.h>
-#include "jabber.h"
+#include "tlen.h"
 
 void TlenProcessPic(XmlNode *node, TlenProtocol *proto);
 BOOL SendPicture(TlenProtocol *, HANDLE hContact);
diff --git a/protocols/Tlen/src/tlen_presence.cpp b/protocols/Tlen/src/tlen_presence.cpp
index 1207857241..a896635c59 100644
--- a/protocols/Tlen/src/tlen_presence.cpp
+++ b/protocols/Tlen/src/tlen_presence.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 #include "tlen_avatar.h"
 
 void TlenProcessPresence(XmlNode *node, TlenProtocol *proto)
diff --git a/protocols/Tlen/src/jabber_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 56df40f443..01388e7074 100644
--- a/protocols/Tlen/src/jabber_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -21,14 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include <io.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "resource.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
 #include "tlen_p2p_old.h"
 #include "tlen_avatar.h"
 #include "tlen_file.h"
diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index ab6130d1c5..4e26a83193 100644
--- a/protocols/Tlen/src/jabber_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -21,11 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 
 #include "commons.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
 #include "resource.h"
 #include "tlen_p2p_old.h"
 #include "tlen_file.h"
@@ -624,7 +624,7 @@ static void JabberProcessMessage(XmlNode *node, ThreadData *info)
 				if ((bodyNode=JabberXmlGetChild(node, "body")) != NULL) {
 					if (bodyNode->text != NULL) {
 						if ((subjectNode=JabberXmlGetChild(node, "subject")) != NULL && subjectNode->text != NULL && subjectNode->text[0] != '\0') {
-							int size = strlen(subjectNode->text)+strlen(bodyNode->text)+5;
+							size_t size = strlen(subjectNode->text)+strlen(bodyNode->text)+5;
 							p = (char *)mir_alloc(size);
 							mir_snprintf(p, size, "%s\r\n%s", subjectNode->text, bodyNode->text);
 							localMessage = JabberTextDecode(p);
diff --git a/protocols/Tlen/src/tlen_userinfo.cpp b/protocols/Tlen/src/tlen_userinfo.cpp
index 8361bbee92..12e591dc97 100644
--- a/protocols/Tlen/src/tlen_userinfo.cpp
+++ b/protocols/Tlen/src/tlen_userinfo.cpp
@@ -21,13 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include <commctrl.h>
 #include <io.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
 #include "resource.h"
 #include "tlen_avatar.h"
 
diff --git a/protocols/Tlen/src/jabber_util.cpp b/protocols/Tlen/src/tlen_util.cpp
index 71a18155b6..ea054d882d 100644
--- a/protocols/Tlen/src/jabber_util.cpp
+++ b/protocols/Tlen/src/tlen_util.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
 #include <ctype.h>
 #include <win2k.h>
 
diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp
index 2c81755c6d..4e9db3aa77 100644
--- a/protocols/Tlen/src/tlen_voice.cpp
+++ b/protocols/Tlen/src/tlen_voice.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include <io.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_button.h>
 //#include <win2k.h>
 #include "resource.h"
-#include "jabber_list.h"
+#include "tlen_list.h"
 #include "tlen_voice.h"
 #include "tlen_p2p_old.h"
 #include "tlen_file.h"
@@ -697,7 +697,7 @@ int TlenVoiceCancelAll(TlenProtocol *proto)
 	return 0;
 }
 
-int TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM lParam)
 {
 	HANDLE hContact;
 	DBVARIANT dbv;
diff --git a/protocols/Tlen/src/tlen_voice.h b/protocols/Tlen/src/tlen_voice.h
index cbd71aa1f1..b1f2a5e2a8 100644
--- a/protocols/Tlen/src/tlen_voice.h
+++ b/protocols/Tlen/src/tlen_voice.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <mmsystem.h>
 
-#include "jabber.h"
+#include "tlen.h"
 extern "C" {
 	#include "codec/gsm.h"
 }
diff --git a/protocols/Tlen/src/jabber_ws.cpp b/protocols/Tlen/src/tlen_ws.cpp
index b1cb066d7a..f1931d5650 100644
--- a/protocols/Tlen/src/jabber_ws.cpp
+++ b/protocols/Tlen/src/tlen_ws.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 
 BOOL JabberWsInit(TlenProtocol *proto)
 {
diff --git a/protocols/Tlen/src/jabber_xml.cpp b/protocols/Tlen/src/tlen_xml.cpp
index 5786404dc6..2364bfcadd 100644
--- a/protocols/Tlen/src/jabber_xml.cpp
+++ b/protocols/Tlen/src/tlen_xml.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "tlen.h"
 #include <ctype.h>
 
 static BOOL JabberXmlProcessElem(XmlState *xmlState, XmlElemType elemType, char *elemText, char *elemAttr);
diff --git a/protocols/Tlen/src/jabber_xml.h b/protocols/Tlen/src/tlen_xml.h
index 165a8fadc5..165a8fadc5 100644
--- a/protocols/Tlen/src/jabber_xml.h
+++ b/protocols/Tlen/src/tlen_xml.h
diff --git a/protocols/Tlen/tlen_10.vcxproj b/protocols/Tlen/tlen_10.vcxproj
index e515d6b7da..fa38451b98 100644
--- a/protocols/Tlen/tlen_10.vcxproj
+++ b/protocols/Tlen/tlen_10.vcxproj
@@ -75,28 +75,19 @@
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
       <BrowseInformationFile>
       </BrowseInformationFile>
@@ -128,27 +119,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
       <BrowseInformationFile>
       </BrowseInformationFile>
@@ -181,19 +164,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -202,7 +176,7 @@
       <FloatingPointModel>Precise</FloatingPointModel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerListingLocation>
       </AssemblerListingLocation>
       <BrowseInformationFile>
@@ -238,18 +212,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -258,7 +224,7 @@
       <FloatingPointModel>Precise</FloatingPointModel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerListingLocation>
       </AssemblerListingLocation>
       <BrowseInformationFile>
@@ -301,16 +267,16 @@
     <ClCompile Include="src\codec\gsm_preprocess.c" />
     <ClCompile Include="src\codec\gsm_rpe.c" />
     <ClCompile Include="src\codec\gsm_short.c" />
-    <ClCompile Include="src\jabber_iq.cpp" />
-    <ClCompile Include="src\jabber_iqid.cpp" />
-    <ClCompile Include="src\jabber_list.cpp" />
-    <ClCompile Include="src\jabber_misc.cpp" />
-    <ClCompile Include="src\jabber_opt.cpp" />
-    <ClCompile Include="src\jabber_svc.cpp" />
-    <ClCompile Include="src\jabber_thread.cpp" />
-    <ClCompile Include="src\jabber_util.cpp" />
-    <ClCompile Include="src\jabber_ws.cpp" />
-    <ClCompile Include="src\jabber_xml.cpp" />
+    <ClCompile Include="src\tlen_iq.cpp" />
+    <ClCompile Include="src\tlen_iqid.cpp" />
+    <ClCompile Include="src\tlen_list.cpp" />
+    <ClCompile Include="src\tlen_misc.cpp" />
+    <ClCompile Include="src\tlen_opt.cpp" />
+    <ClCompile Include="src\tlen_svc.cpp" />
+    <ClCompile Include="src\tlen_thread.cpp" />
+    <ClCompile Include="src\tlen_util.cpp" />
+    <ClCompile Include="src\tlen_ws.cpp" />
+    <ClCompile Include="src\tlen_xml.cpp" />
     <ClCompile Include="src\crypto\padlock.c" />
     <ClCompile Include="src\tlen.cpp" />
     <ClCompile Include="src\tlen_advsearch.cpp" />
@@ -334,10 +300,10 @@
     <ClInclude Include="src\crypto\polarssl\bn_mul.h" />
     <ClInclude Include="src\crypto\polarssl\config.h" />
     <ClInclude Include="src\codec\gsm.h" />
-    <ClInclude Include="src\jabber.h" />
-    <ClInclude Include="src\jabber_iq.h" />
-    <ClInclude Include="src\jabber_list.h" />
-    <ClInclude Include="src\jabber_xml.h" />
+    <ClInclude Include="src\tlen.h" />
+    <ClInclude Include="src\tlen_iq.h" />
+    <ClInclude Include="src\tlen_list.h" />
+    <ClInclude Include="src\tlen_xml.h" />
     <ClInclude Include="src\crypto\polarssl\padlock.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\tlen_avatar.h" />
diff --git a/protocols/Tlen/tlen_10.vcxproj.filters b/protocols/Tlen/tlen_10.vcxproj.filters
index 2893437d57..1f0de881e5 100644
--- a/protocols/Tlen/tlen_10.vcxproj.filters
+++ b/protocols/Tlen/tlen_10.vcxproj.filters
@@ -28,34 +28,34 @@
     <ClCompile Include="src\crypto\padlock.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_iq.cpp">
+    <ClCompile Include="src\tlen_iq.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_iqid.cpp">
+    <ClCompile Include="src\tlen_iqid.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_list.cpp">
+    <ClCompile Include="src\tlen_list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_misc.cpp">
+    <ClCompile Include="src\tlen_misc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_opt.cpp">
+    <ClCompile Include="src\tlen_opt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_svc.cpp">
+    <ClCompile Include="src\tlen_svc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_thread.cpp">
+    <ClCompile Include="src\tlen_thread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_util.cpp">
+    <ClCompile Include="src\tlen_util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_ws.cpp">
+    <ClCompile Include="src\tlen_ws.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_xml.cpp">
+    <ClCompile Include="src\tlen_xml.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\tlen.cpp">
@@ -108,13 +108,13 @@
     <ClInclude Include="src\codec\gsm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber_iq.h">
+    <ClInclude Include="src\tlen_iq.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber.h">
+    <ClInclude Include="src\tlen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber_list.h">
+    <ClInclude Include="src\tlen_list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\tlen_voice.h">
@@ -144,7 +144,7 @@
     <ClInclude Include="src\crypto\polarssl\padlock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber_xml.h">
+    <ClInclude Include="src\tlen_xml.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\commons.h">
diff --git a/protocols/Tlen/tlen_11.vcxproj b/protocols/Tlen/tlen_11.vcxproj
index b184f4da20..5bb46928bc 100644
--- a/protocols/Tlen/tlen_11.vcxproj
+++ b/protocols/Tlen/tlen_11.vcxproj
@@ -78,28 +78,19 @@
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
       <BrowseInformationFile>
       </BrowseInformationFile>
@@ -130,27 +121,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
       <BrowseInformationFile>
       </BrowseInformationFile>
@@ -182,19 +165,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -203,7 +177,7 @@
       <FloatingPointModel>Precise</FloatingPointModel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerListingLocation>
       </AssemblerListingLocation>
       <BrowseInformationFile>
@@ -239,18 +213,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/jabber.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>false</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -259,7 +225,7 @@
       <FloatingPointModel>Precise</FloatingPointModel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>jabber.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>tlen.h</PrecompiledHeaderFile>
       <AssemblerListingLocation>
       </AssemblerListingLocation>
       <BrowseInformationFile>
@@ -302,16 +268,16 @@
     <ClCompile Include="src\codec\gsm_preprocess.c" />
     <ClCompile Include="src\codec\gsm_rpe.c" />
     <ClCompile Include="src\codec\gsm_short.c" />
-    <ClCompile Include="src\jabber_iq.cpp" />
-    <ClCompile Include="src\jabber_iqid.cpp" />
-    <ClCompile Include="src\jabber_list.cpp" />
-    <ClCompile Include="src\jabber_misc.cpp" />
-    <ClCompile Include="src\jabber_opt.cpp" />
-    <ClCompile Include="src\jabber_svc.cpp" />
-    <ClCompile Include="src\jabber_thread.cpp" />
-    <ClCompile Include="src\jabber_util.cpp" />
-    <ClCompile Include="src\jabber_ws.cpp" />
-    <ClCompile Include="src\jabber_xml.cpp" />
+    <ClCompile Include="src\tlen_iq.cpp" />
+    <ClCompile Include="src\tlen_iqid.cpp" />
+    <ClCompile Include="src\tlen_list.cpp" />
+    <ClCompile Include="src\tlen_misc.cpp" />
+    <ClCompile Include="src\tlen_opt.cpp" />
+    <ClCompile Include="src\tlen_svc.cpp" />
+    <ClCompile Include="src\tlen_thread.cpp" />
+    <ClCompile Include="src\tlen_util.cpp" />
+    <ClCompile Include="src\tlen_ws.cpp" />
+    <ClCompile Include="src\tlen_xml.cpp" />
     <ClCompile Include="src\crypto\padlock.c" />
     <ClCompile Include="src\tlen.cpp" />
     <ClCompile Include="src\tlen_advsearch.cpp" />
@@ -335,10 +301,10 @@
     <ClInclude Include="src\crypto\polarssl\bn_mul.h" />
     <ClInclude Include="src\crypto\polarssl\config.h" />
     <ClInclude Include="src\codec\gsm.h" />
-    <ClInclude Include="src\jabber.h" />
-    <ClInclude Include="src\jabber_iq.h" />
-    <ClInclude Include="src\jabber_list.h" />
-    <ClInclude Include="src\jabber_xml.h" />
+    <ClInclude Include="src\tlen.h" />
+    <ClInclude Include="src\tlen_iq.h" />
+    <ClInclude Include="src\tlen_list.h" />
+    <ClInclude Include="src\tlen_xml.h" />
     <ClInclude Include="src\crypto\polarssl\padlock.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\tlen_avatar.h" />
diff --git a/protocols/Tlen/tlen_11.vcxproj.filters b/protocols/Tlen/tlen_11.vcxproj.filters
index 2893437d57..1f0de881e5 100644
--- a/protocols/Tlen/tlen_11.vcxproj.filters
+++ b/protocols/Tlen/tlen_11.vcxproj.filters
@@ -28,34 +28,34 @@
     <ClCompile Include="src\crypto\padlock.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_iq.cpp">
+    <ClCompile Include="src\tlen_iq.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_iqid.cpp">
+    <ClCompile Include="src\tlen_iqid.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_list.cpp">
+    <ClCompile Include="src\tlen_list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_misc.cpp">
+    <ClCompile Include="src\tlen_misc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_opt.cpp">
+    <ClCompile Include="src\tlen_opt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_svc.cpp">
+    <ClCompile Include="src\tlen_svc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_thread.cpp">
+    <ClCompile Include="src\tlen_thread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_util.cpp">
+    <ClCompile Include="src\tlen_util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_ws.cpp">
+    <ClCompile Include="src\tlen_ws.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\jabber_xml.cpp">
+    <ClCompile Include="src\tlen_xml.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\tlen.cpp">
@@ -108,13 +108,13 @@
     <ClInclude Include="src\codec\gsm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber_iq.h">
+    <ClInclude Include="src\tlen_iq.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber.h">
+    <ClInclude Include="src\tlen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber_list.h">
+    <ClInclude Include="src\tlen_list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\tlen_voice.h">
@@ -144,7 +144,7 @@
     <ClInclude Include="src\crypto\polarssl\padlock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\jabber_xml.h">
+    <ClInclude Include="src\tlen_xml.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\commons.h">