4 files changed, 7 insertions, 7 deletions
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp
index 53d1743740..d3282bb565 100644
--- a/protocols/SkypeWeb/src/skype_avatars.cpp
+++ b/protocols/SkypeWeb/src/skype_avatars.cpp
@@ -133,7 +133,7 @@ void CSkypeProto::GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t cb
 	pszDest[tPathLen++] = '\\';
 
 	const TCHAR* szFileType = ProtoGetAvatarExtension(getByte(hContact, "AvatarType", PA_FORMAT_JPEG));
-	ptrA username(getStringA(hContact, "Skypename"));
+	ptrA username(getStringA(hContact, SKYPE_SETTINGS_ID));
 	mir_sntprintf(pszDest + tPathLen, MAX_PATH - tPathLen, _T("%s%s"), _A2T(username), szFileType);
 }
 
@@ -197,7 +197,7 @@ INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM wParam, LPARAM lParam)
 
 
 		ptrA token(getStringA("TokenSecret"));
-		ptrA skypename(getStringA("Skypename"));
+		ptrA skypename(getStringA(SKYPE_SETTINGS_ID));
 		PushRequest(new SetAvatarRequest(token, skypename, data, length), &CSkypeProto::OnSentAvatar);
 	}
 	else
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index b60464604f..f710e1ecda 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -128,7 +128,7 @@ int CSkypeProto::OnSendMessage(MCONTACT hContact, int flags, const char *szMessa
 
 	ptrA server(getStringA("Server"));
 	ptrA token(getStringA("registrationToken"));
-	ptrA username(getStringA(hContact, "Skypename"));
+	ptrA username(getStringA(hContact, SKYPE_SETTINGS_ID));
 
 	debugLogA(__FUNCTION__ " clientmsgid = %d", param->hMessage);
 
@@ -156,7 +156,7 @@ void CSkypeProto::OnMessageSent(const NETLIBHTTPREQUEST *response, void *arg)
 			JSONNODE *node = json_get(root, "errorCode");
 			error = _T2A(json_as_string(node));
 		}
-		ptrT username(getTStringA(hContact, "Skypename"));
+		ptrT username(getTStringA(hContact, SKYPE_SETTINGS_ID));
 		debugLogA(__FUNCTION__": failed to send message for %s (%s)", username, error);
 		ProtoBroadcastAck(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, hMessage, (LPARAM)error.GetBuffer());
 		return;
@@ -233,7 +233,7 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response)
 
 INT_PTR CSkypeProto::GetContactHistory(WPARAM hContact, LPARAM lParam)
 {
-	PushRequest(new GetHistoryRequest(ptrA(getStringA("registrationToken")), ptrA(db_get_sa(hContact, m_szModuleName, "Skypename")), ptrA(getStringA("Server"))), &CSkypeProto::OnGetServerHistory);
+	PushRequest(new GetHistoryRequest(ptrA(getStringA("registrationToken")), ptrA(db_get_sa(hContact, m_szModuleName, SKYPE_SETTINGS_ID)), ptrA(getStringA("Server"))), &CSkypeProto::OnGetServerHistory);
 	return 0;
 }
 
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 7fa54777c1..5d51612e80 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -246,7 +246,7 @@ int CSkypeProto::SetAwayMsg(int, const PROTOCHAR *msg) { return 0; }
 int CSkypeProto::UserIsTyping(MCONTACT hContact, int type)
 {
 	ptrA regToken(getStringA("registrationToken"));
-	ptrA username(getStringA(hContact, "Skypename"));
+	ptrA username(getStringA(hContact, SKYPE_SETTINGS_ID));
 	ptrA server(getStringA("Server"));
 	PushRequest(new SendTypingRequest(regToken, username, type, server));
 	return 0;
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp
index f231ccdd41..dfb57323c8 100644
--- a/protocols/SkypeWeb/src/skype_utils.cpp
+++ b/protocols/SkypeWeb/src/skype_utils.cpp
@@ -97,7 +97,7 @@ time_t CSkypeProto::IsoToUnixTime(const TCHAR *stamp)
 
 bool CSkypeProto::IsMe(const char *skypeName)
 {
-	ptrA mySkypeName(getStringA("Skypename"));
+	ptrA mySkypeName(getStringA(SKYPE_SETTINGS_ID));
 	ptrA SelfEndpointName(getStringA("SelfEndpointName"));
 	if (!mir_strcmp(skypeName, mySkypeName) || !mir_strcmp(skypeName, SelfEndpointName))
 		return true;