diff --git a/linphone/oRTP/include/ortp/stun.h b/linphone/oRTP/include/ortp/stun.h
index b7be9a4b3..08654f20f 100644
--- a/linphone/oRTP/include/ortp/stun.h
+++ b/linphone/oRTP/include/ortp/stun.h
@@ -116,8 +116,8 @@ typedef struct { unsigned char octet[16]; }  UInt128;
 #define ChangeRequest     0x0003
 #define SourceAddress     0x0004
 #define ChangedAddress    0x0005
-#define Username          0x0006
-#define Password          0x0007
+#define STUNUsername      0x0006 /* Username is too common: rename to avoid conflict */
+#define STUNPassword      0x0007 /* Password is too common: rename to avoid conflict */
 #define MessageIntegrity  0x0008
 #define ErrorCode         0x0009
 #define UnknownAttribute  0x000A
diff --git a/linphone/oRTP/src/stun.c b/linphone/oRTP/src/stun.c
index 7b9038938..9e267ea95 100644
--- a/linphone/oRTP/src/stun.c
+++ b/linphone/oRTP/src/stun.c
@@ -380,7 +380,7 @@ stunParseMessage( char* buf, unsigned int bufLen, StunMessage *msg, bool_t verbo
                if (verbose) ortp_message("stun: ChangedAddress = %s\n", ipaddr(&msg->changedAddress.ipv4));
             }
       }
-      else if (atrType == Username)
+      else if (atrType == STUNUsername)
       {
             msg->hasUsername = TRUE;
             if (stunParseAtrString( body, attrLen, &msg->username) == FALSE)
@@ -394,7 +394,7 @@ stunParseMessage( char* buf, unsigned int bufLen, StunMessage *msg, bool_t verbo
 				   ortp_message("stun: Username = %s\n", msg->username.value );
             }					
       }
-      else if (atrType == Password)
+      else if (atrType == STUNPassword)
       {
             msg->hasPassword = TRUE;
             if (stunParseAtrString( body, attrLen, &msg->password) == FALSE)
@@ -677,12 +677,12 @@ stunEncodeMessage( const StunMessage *msg,
    if (msg->hasUsername)
    {
       if (verbose) ortp_message("stun: Encoding Username: %s\n", msg->username.value );
-      ptr = encodeAtrString(ptr, Username, &msg->username);
+      ptr = encodeAtrString(ptr, STUNUsername, &msg->username);
    }
    if (msg->hasPassword)
    {
       if (verbose) ortp_message("stun: Encoding Password: %s\n", msg->password.value );
-      ptr = encodeAtrString(ptr, Password, &msg->password);
+      ptr = encodeAtrString(ptr, STUNPassword, &msg->password);
    }
    if (msg->hasErrorCode)
    {