diff --git a/daemon/src/audio/audiortp/audio_rtp_factory.cpp b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
index 21d2bea2111019a1b0348ea2fc86a4ffe9fc64d1..aaac2ef4feb0028427887d21b9f96f110c4105a7 100644
--- a/daemon/src/audio/audiortp/audio_rtp_factory.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
@@ -38,7 +38,7 @@
 #include "sip/sdp.h"
 #include "sip/sipcall.h"
 #include "sip/sipaccount.h"
-#include "sip/SdesNegotiator.h"
+#include "sip/sdes_negotiator.h"
 
 namespace sfl {
 
diff --git a/daemon/src/audio/audiortp/audio_rtp_factory.h b/daemon/src/audio/audiortp/audio_rtp_factory.h
index 2b9cf9901899199eb0225324d3ab718565bc521b..80adaae98aab9a641bd2a04a284a81a076e23c8e 100644
--- a/daemon/src/audio/audiortp/audio_rtp_factory.h
+++ b/daemon/src/audio/audiortp/audio_rtp_factory.h
@@ -36,7 +36,7 @@
 #include <ccrtp/CryptoContext.h>
 #include "audio_rtp_session.h"
 
-#include "sip/SdesNegotiator.h"
+#include "sip/sdes_negotiator.h"
 
 class SdesNegotiator;
 class SIPCall;
diff --git a/daemon/src/audio/audiortp/audio_srtp_session.h b/daemon/src/audio/audiortp/audio_srtp_session.h
index 301d27a422ffe264747df2c4ca06466560fd8797..b4df5643550cde80866d7c1a7b1a4f0894cf4462 100644
--- a/daemon/src/audio/audiortp/audio_srtp_session.h
+++ b/daemon/src/audio/audiortp/audio_srtp_session.h
@@ -32,7 +32,7 @@
 
 #include "audio_rtp_session.h"
 #include "audio_symmetric_rtp_session.h"
-#include "sip/SdesNegotiator.h"
+#include "sip/sdes_negotiator.h"
 
 #include <ccrtp/CryptoContext.h>
 #include <vector>
diff --git a/daemon/src/sip/Makefile.am b/daemon/src/sip/Makefile.am
index 42563e0c7a9e57e7316322caa218d269d99c1934..539a041feb29a3b10efcf1f47980c79c501b4482 100644
--- a/daemon/src/sip/Makefile.am
+++ b/daemon/src/sip/Makefile.am
@@ -3,16 +3,14 @@ include $(top_srcdir)/globals.mak
 noinst_LTLIBRARIES = libsiplink.la
 
 libsiplink_la_SOURCES = \
-		Pattern.cpp \
-		SdesNegotiator.cpp \
+		pattern.cpp \
+		sdes_negotiator.cpp \
 		sdp.cpp \
 		sipaccount.cpp \
 		sipcall.cpp \
-		sipvoiplink.cpp
-
-noinst_HEADERS = \
-		Pattern.h \
-		SdesNegotiator.h \
+		sipvoiplink.cpp \
+		pattern.h \
+		sdes_negotiator.h \
 		sdp.h \
 		sipaccount.h \
 		sipcall.h \
diff --git a/daemon/src/sip/Pattern.cpp b/daemon/src/sip/pattern.cpp
similarity index 99%
rename from daemon/src/sip/Pattern.cpp
rename to daemon/src/sip/pattern.cpp
index b2e3ace0403cf5989f4ecdcdd322666ae5b1afae..4627cd62b502ccd9e66f3f9b33ab7e72e3c08294 100644
--- a/daemon/src/sip/Pattern.cpp
+++ b/daemon/src/sip/pattern.cpp
@@ -27,7 +27,7 @@
  *  as that of the covered work.
  */
 
-#include "Pattern.h"
+#include "pattern.h"
 #include <sstream>
 #include <cstdio>
 
diff --git a/daemon/src/sip/Pattern.h b/daemon/src/sip/pattern.h
similarity index 98%
rename from daemon/src/sip/Pattern.h
rename to daemon/src/sip/pattern.h
index 40eb6f7b59b2a38386d6aeae2cc1b5ff1ead7e73..fa1ee38b9549427e984a7ed75b13dfec2d138191 100644
--- a/daemon/src/sip/Pattern.h
+++ b/daemon/src/sip/pattern.h
@@ -26,8 +26,8 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-#ifndef __SFL_PATTERN_H__
-#define __SFL_PATTERN_H__
+#ifndef __PATTERN_H__
+#define __PATTERN_H__
 
 #include <stdexcept>
 #include <string>
@@ -345,4 +345,4 @@ class Pattern {
 }
 
 
-#endif
+#endif // __PATTERN_H__ // __PATTERN_H__ // __PATTERN_H__ // __PATTERN_H__
diff --git a/daemon/src/sip/SdesNegotiator.cpp b/daemon/src/sip/sdes_negotiator.cpp
similarity index 99%
rename from daemon/src/sip/SdesNegotiator.cpp
rename to daemon/src/sip/sdes_negotiator.cpp
index d8d96b6968a181612cca9f6060f3974cee312036..0bb8e8d587868d0f1ab806ad79c3cfcb91ff06aa 100644
--- a/daemon/src/sip/SdesNegotiator.cpp
+++ b/daemon/src/sip/sdes_negotiator.cpp
@@ -28,9 +28,8 @@
  *  as that of the covered work.
  */
 
-#include "SdesNegotiator.h"
-
-#include "Pattern.h"
+#include "sdes_negotiator.h"
+#include "pattern.h"
 
 #include <cstdio>
 #include <iostream>
diff --git a/daemon/src/sip/SdesNegotiator.h b/daemon/src/sip/sdes_negotiator.h
similarity index 98%
rename from daemon/src/sip/SdesNegotiator.h
rename to daemon/src/sip/sdes_negotiator.h
index 39aad418d88363dc32654d53d8ae0ea0a2e3e7a2..6c63961e40df8b001ca4b0b6059d65d7915d1817 100644
--- a/daemon/src/sip/SdesNegotiator.h
+++ b/daemon/src/sip/sdes_negotiator.h
@@ -27,8 +27,8 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-#ifndef __SFL_SDES_NEGOTIATOR_H__
-#define __SFL_SDES_NEGOTIATOR_H__
+#ifndef __SDES_NEGOTIATOR_H__
+#define __SDES_NEGOTIATOR_H__
 
 #include <stdexcept>
 #include <string>
@@ -254,4 +254,4 @@ class SdesNegotiator {
         std::vector<CryptoAttribute *> parse(void);
 };
 }
-#endif
+#endif // __SDES_NEGOTIATOR_H__
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index 7ebb0c7f8563f339b39afb74c62c23250ecaf690..a37bc8fcb894264c503d8e95dbf5a15b895d4100 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -44,7 +44,7 @@
 #include "sipcall.h"
 #include "sipaccount.h"
 #include "eventthread.h"
-#include "SdesNegotiator.h"
+#include "sdes_negotiator.h"
 
 #include "dbus/dbusmanager.h"
 #include "dbus/callmanager.h"
diff --git a/daemon/test/sdesnegotiatortest.cpp b/daemon/test/sdesnegotiatortest.cpp
index 658a5ce7244f2adebacc0757fb53cfdee9fb9346..4b9b75045a4dc3ba7fe6ec250af2935a0e4c3e1c 100644
--- a/daemon/test/sdesnegotiatortest.cpp
+++ b/daemon/test/sdesnegotiatortest.cpp
@@ -41,6 +41,8 @@
 #include <sstream>
 
 #include "sdesnegotiatortest.h"
+#include "sip/pattern.h"
+#include "sip/sdes_negotiator.h"
 
 #include <unistd.h>
 #include "global.h"
diff --git a/daemon/test/sdesnegotiatortest.h b/daemon/test/sdesnegotiatortest.h
index 7323dcfd6668f7a78cbaae8a103cffb26a3abb90..dbb46c966d97b6645f159e931cde652581e49152 100644
--- a/daemon/test/sdesnegotiatortest.h
+++ b/daemon/test/sdesnegotiatortest.h
@@ -34,8 +34,6 @@
 #include <cppunit/TestCase.h>
 #include <cppunit/TestSuite.h>
 
-#include <assert.h>
-
 #include <cstddef>
 #include <stdio.h>
 #include <sstream>
@@ -50,20 +48,19 @@
 #include <pjlib-util.h>
 #include <pjnath/stun_config.h>
 
-// Application import
-#include "sip/SdesNegotiator.h"
-#include "sip/Pattern.h"
-
-
 /*
  * @file sdesnegotiationTest.cpp
  * @brief       Regroups unitary tests related to the plugin manager.
  */
 
-#ifndef _SDESNEGOTIATOR_TEST_
-#define _SDESNEGOTIATOR_TEST_
+#ifndef __SDESNEGOTIATOR_TEST_H__
+#define __SDESNEGOTIATOR_TEST_H__
 
+#include "sip/sdes_negotiator.h" // for CryptoSuiteDefinition
 
+namespace sfl {
+    class Pattern;
+}
 
 class SdesNegotiatorTest : public CppUnit::TestCase {
 
@@ -119,4 +116,4 @@ class SdesNegotiatorTest : public CppUnit::TestCase {
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SdesNegotiatorTest, "SdesNegotiatorTest");
 CPPUNIT_TEST_SUITE_REGISTRATION(SdesNegotiatorTest);
 
-#endif
+#endif // __SDESNEGOTIATOR_TEST_H__