diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am
index a727a9e6f..5d5daf375 100644
--- a/daemon/src/audio/audiortp/Makefile.am
+++ b/daemon/src/audio/audiortp/Makefile.am
@@ -3,20 +3,18 @@ include $(top_srcdir)/globals.mak
 noinst_LTLIBRARIES = libaudiortp.la
 
 libaudiortp_la_SOURCES = \
-		AudioRtpSession.cpp \
-		AudioSymmetricRtpSession.cpp \
-		AudioRtpRecordHandler.cpp \
-		AudioRtpFactory.cpp \
-		AudioZrtpSession.cpp \
-		ZrtpSessionCallback.cpp \
-		AudioSrtpSession.cpp
-
-noinst_HEADERS = \
-		AudioRtpSession.h \
-		AudioRtpRecordHandler.h \
-		AudioRtpFactory.h \
-		AudioSymmetricRtpSession.h \
-		AudioZrtpSession.h \
-		ZrtpSessionCallback.h \
-		AudioSrtpSession.h 
+		audio_rtp_session.cpp \
+		audio_symmetric_rtp_session.cpp \
+		audio_rtp_record_handler.cpp \
+		audio_rtp_factory.cpp \
+		audio_zrtp_session.cpp \
+		zrtp_session_callback.cpp \
+		audio_srtp_session.cpp \
+		audio_rtp_session.h \
+		audio_rtp_record_handler.h \
+		audio_rtp_factory.h \
+		audio_symmetric_rtp_session.h \
+		audio_zrtp_session.h \
+		zrtp_session_callback.h \
+		audio_srtp_session.h 
 
diff --git a/daemon/src/audio/audiortp/AudioRtpFactory.cpp b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
similarity index 97%
rename from daemon/src/audio/audiortp/AudioRtpFactory.cpp
rename to daemon/src/audio/audiortp/audio_rtp_factory.cpp
index e92c7f20d..21d2bea21 100644
--- a/daemon/src/audio/audiortp/AudioRtpFactory.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
@@ -30,24 +30,20 @@
 
 
 
-#include "AudioRtpFactory.h"
-#include "AudioZrtpSession.h"
-#include "AudioSrtpSession.h"
-#include "AudioSymmetricRtpSession.h"
+#include "audio_rtp_factory.h"
+#include "audio_zrtp_session.h"
+#include "audio_srtp_session.h"
+#include "audio_symmetric_rtp_session.h"
 #include "manager.h"
 #include "sip/sdp.h"
 #include "sip/sipcall.h"
 #include "sip/sipaccount.h"
 #include "sip/SdesNegotiator.h"
 
-#include <cassert>
-
 namespace sfl {
 
 AudioRtpFactory::AudioRtpFactory(SIPCall *ca) : _rtpSession(NULL), remoteContext(NULL), localContext(NULL), ca_(ca)
-{
-
-}
+{}
 
 AudioRtpFactory::~AudioRtpFactory()
 {
diff --git a/daemon/src/audio/audiortp/AudioRtpFactory.h b/daemon/src/audio/audiortp/audio_rtp_factory.h
similarity index 96%
rename from daemon/src/audio/audiortp/AudioRtpFactory.h
rename to daemon/src/audio/audiortp/audio_rtp_factory.h
index 5f19d57c3..2b9cf9901 100644
--- a/daemon/src/audio/audiortp/AudioRtpFactory.h
+++ b/daemon/src/audio/audiortp/audio_rtp_factory.h
@@ -28,21 +28,18 @@
  *  as that of the covered work.
  */
 
-#ifndef __SFL_AUDIO_RTP_FACTORY_H__
-#define __SFL_AUDIO_RTP_FACTORY_H__
+#ifndef __AUDIO_RTP_FACTORY_H__
+#define __AUDIO_RTP_FACTORY_H__
 
 #include <stdexcept>
 #include <cc++/thread.h>
-#include "account.h" // for typedef of std::string (std::string)
 #include <ccrtp/CryptoContext.h>
-#include "AudioRtpSession.h"
+#include "audio_rtp_session.h"
 
 #include "sip/SdesNegotiator.h"
 
 class SdesNegotiator;
 class SIPCall;
-class Account;
-class SIPAccount;
 
 namespace sfl {
 
diff --git a/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
similarity index 99%
rename from daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
rename to daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
index 7213d27f1..9ed316885 100644
--- a/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
@@ -27,15 +27,13 @@
  *  as that of the covered work.
  */
 
-#include "AudioRtpRecordHandler.h"
+#include "audio_rtp_record_handler.h"
 #include <fstream>
 
 #include "sip/sipcall.h"
 #include "audio/audiolayer.h"
 #include "manager.h"
 
-// #define DUMP_PROCESS_DATA_ENCODE
-
 namespace sfl {
 
 static const SFLDataFormat initFadeinFactor = 32000;
diff --git a/daemon/src/audio/audiortp/AudioRtpRecordHandler.h b/daemon/src/audio/audiortp/audio_rtp_record_handler.h
similarity index 97%
rename from daemon/src/audio/audiortp/AudioRtpRecordHandler.h
rename to daemon/src/audio/audiortp/audio_rtp_record_handler.h
index 2fdf02863..b249a004b 100644
--- a/daemon/src/audio/audiortp/AudioRtpRecordHandler.h
+++ b/daemon/src/audio/audiortp/audio_rtp_record_handler.h
@@ -27,8 +27,8 @@
  *  as that of the covered work.
  */
 
-#ifndef AUDIORTPRECORDHANDLER_H_
-#define AUDIORTPRECORDHANDLER_H_
+#ifndef __AUDIO_RTP_RECORD_HANDLER_H__
+#define __AUDIO_RTP_RECORD_HANDLER_H__
 #include <cstddef>
 
 using std::ptrdiff_t;
@@ -43,7 +43,6 @@ class SIPCall;
 #include "audio/speexechocancel.h"
 #include "audio/echosuppress.h"
 #include "audio/gaincontrol.h"
-#include "managerimpl.h"
 
 namespace sfl {
 
@@ -183,4 +182,4 @@ class AudioRtpRecordHandler {
 
 }
 
-#endif /* AUDIORTPRECORD_H_ */
+#endif // __AUDIO_RTP_RECORD_HANDLER_H__
diff --git a/daemon/src/audio/audiortp/AudioRtpSession.cpp b/daemon/src/audio/audiortp/audio_rtp_session.cpp
similarity index 99%
rename from daemon/src/audio/audiortp/AudioRtpSession.cpp
rename to daemon/src/audio/audiortp/audio_rtp_session.cpp
index b76270c58..aaf292c93 100644
--- a/daemon/src/audio/audiortp/AudioRtpSession.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_session.cpp
@@ -32,8 +32,8 @@
  *  as that of the covered work.
  */
 
-#include "AudioRtpSession.h"
-#include "AudioSymmetricRtpSession.h"
+#include "audio_rtp_session.h"
+#include "audio_symmetric_rtp_session.h"
 
 #include "sip/sdp.h"
 #include "audio/audiolayer.h"
diff --git a/daemon/src/audio/audiortp/AudioRtpSession.h b/daemon/src/audio/audiortp/audio_rtp_session.h
similarity index 99%
rename from daemon/src/audio/audiortp/AudioRtpSession.h
rename to daemon/src/audio/audiortp/audio_rtp_session.h
index d9f73281d..64ebd2cbd 100644
--- a/daemon/src/audio/audiortp/AudioRtpSession.h
+++ b/daemon/src/audio/audiortp/audio_rtp_session.h
@@ -34,7 +34,7 @@
 #ifndef __SFL_AUDIO_RTP_SESSION_H__
 #define __SFL_AUDIO_RTP_SESSION_H__
 
-#include "AudioRtpRecordHandler.h"
+#include "audio_rtp_record_handler.h"
 #include <audio/codecs/audiocodec.h>
 #include <ccrtp/rtp.h>
 #include <ccrtp/formats.h>
diff --git a/daemon/src/audio/audiortp/AudioSrtpSession.cpp b/daemon/src/audio/audiortp/audio_srtp_session.cpp
similarity index 99%
rename from daemon/src/audio/audiortp/AudioSrtpSession.cpp
rename to daemon/src/audio/audiortp/audio_srtp_session.cpp
index a6cd82b0e..01e917341 100644
--- a/daemon/src/audio/audiortp/AudioSrtpSession.cpp
+++ b/daemon/src/audio/audiortp/audio_srtp_session.cpp
@@ -27,7 +27,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-#include "AudioSrtpSession.h"
+#include "audio_srtp_session.h"
 
 #include "sip/sipcall.h"
 
diff --git a/daemon/src/audio/audiortp/AudioSrtpSession.h b/daemon/src/audio/audiortp/audio_srtp_session.h
similarity index 97%
rename from daemon/src/audio/audiortp/AudioSrtpSession.h
rename to daemon/src/audio/audiortp/audio_srtp_session.h
index 99ef2f548..301d27a42 100644
--- a/daemon/src/audio/audiortp/AudioSrtpSession.h
+++ b/daemon/src/audio/audiortp/audio_srtp_session.h
@@ -27,11 +27,11 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-#ifndef __SFL_AUDIO_SRTP_SESSION_H__
-#define __SFL_AUDIO_SRTP_SESSION_H__
+#ifndef __AUDIO_SRTP_SESSION_H__
+#define __AUDIO_SRTP_SESSION_H__
 
-#include "AudioRtpSession.h"
-#include "AudioSymmetricRtpSession.h"
+#include "audio_rtp_session.h"
+#include "audio_symmetric_rtp_session.h"
 #include "sip/SdesNegotiator.h"
 
 #include <ccrtp/CryptoContext.h>
@@ -183,7 +183,6 @@ class AudioSrtpSession : public AudioSymmetricRtpSession {
         /** Used to make sure remote crypto context not initialized wice. */
         bool _remoteOfferIsSet;
 };
-
 }
 
 #endif // __AUDIO_SRTP_SESSION_H__
diff --git a/daemon/src/audio/audiortp/AudioSymmetricRtpSession.cpp b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp
similarity index 96%
rename from daemon/src/audio/audiortp/AudioSymmetricRtpSession.cpp
rename to daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp
index a6ba52d47..1d5f57a26 100644
--- a/daemon/src/audio/audiortp/AudioSymmetricRtpSession.cpp
+++ b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp
@@ -32,13 +32,12 @@
  *  as that of the covered work.
  */
 
-#include "AudioRtpSession.h"
-#include "AudioSymmetricRtpSession.h"
-#include "AudioRtpRecordHandler.h"
-
-
+#include "audio_rtp_session.h"
+#include "audio_symmetric_rtp_session.h"
+#include "audio_rtp_record_handler.h"
 #include "sip/sdp.h"
 #include "audio/audiolayer.h"
+
 namespace sfl {
 
 AudioSymmetricRtpSession::AudioSymmetricRtpSession(SIPCall * sipcall) :
diff --git a/daemon/src/audio/audiortp/AudioSymmetricRtpSession.h b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
similarity index 94%
rename from daemon/src/audio/audiortp/AudioSymmetricRtpSession.h
rename to daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
index 2d4965e52..8eee8ab6d 100644
--- a/daemon/src/audio/audiortp/AudioSymmetricRtpSession.h
+++ b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
@@ -31,18 +31,19 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-#ifndef __SFL_AUDIO_SYMMETRIC_RTP_SESSION_H__
-#define __SFL_AUDIO_SYMMETRIC_RTP_SESSION_H__
+#ifndef __AUDIO_SYMMETRIC_RTP_SESSION_H__
+#define __AUDIO_SYMMETRIC_RTP_SESSION_H__
 
 #include <iostream>
 #include <exception>
 #include <list>
+#include <cassert>
 #include <cstddef>
 
 #include "global.h"
 
-#include "AudioRtpSession.h"
-#include "AudioRtpRecordHandler.h"
+#include "audio_rtp_session.h"
+#include "audio_rtp_record_handler.h"
 #include "sip/sipcall.h"
 #include "audio/codecs/audiocodec.h"
 
diff --git a/daemon/src/audio/audiortp/AudioZrtpSession.cpp b/daemon/src/audio/audiortp/audio_zrtp_session.cpp
similarity index 98%
rename from daemon/src/audio/audiortp/AudioZrtpSession.cpp
rename to daemon/src/audio/audiortp/audio_zrtp_session.cpp
index e368985f5..a09d8256c 100644
--- a/daemon/src/audio/audiortp/AudioZrtpSession.cpp
+++ b/daemon/src/audio/audiortp/audio_zrtp_session.cpp
@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include "AudioZrtpSession.h"
-#include "ZrtpSessionCallback.h"
+#include "audio_zrtp_session.h"
+#include "zrtp_session_callback.h"
 
 #include "sip/sipcall.h"
 #include "sip/sdp.h"
diff --git a/daemon/src/audio/audiortp/AudioZrtpSession.h b/daemon/src/audio/audiortp/audio_zrtp_session.h
similarity index 96%
rename from daemon/src/audio/audiortp/AudioZrtpSession.h
rename to daemon/src/audio/audiortp/audio_zrtp_session.h
index 81df0b161..920d10b3d 100644
--- a/daemon/src/audio/audiortp/AudioZrtpSession.h
+++ b/daemon/src/audio/audiortp/audio_zrtp_session.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_AUDIO_ZRTP_SESSION_H__
-#define __SFL_AUDIO_ZRTP_SESSION_H__
+#ifndef __AUDIO_ZRTP_SESSION_H__
+#define __AUDIO_ZRTP_SESSION_H__
 
 #include <cstddef>
 #include <stdexcept>
@@ -39,7 +39,7 @@ using std::ptrdiff_t;
 #include <libzrtpcpp/ZrtpQueue.h>
 #include <libzrtpcpp/ZrtpUserCallback.h>
 
-#include "AudioRtpSession.h"
+#include "audio_rtp_session.h"
 #include <cc++/numbers.h> // OST::Time
 
 class SIPCall;
diff --git a/daemon/src/audio/audiortp/ZrtpSessionCallback.cpp b/daemon/src/audio/audiortp/zrtp_session_callback.cpp
similarity index 99%
rename from daemon/src/audio/audiortp/ZrtpSessionCallback.cpp
rename to daemon/src/audio/audiortp/zrtp_session_callback.cpp
index 44a1452c5..68f6c9f86 100644
--- a/daemon/src/audio/audiortp/ZrtpSessionCallback.cpp
+++ b/daemon/src/audio/audiortp/zrtp_session_callback.cpp
@@ -27,7 +27,7 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
-#include "ZrtpSessionCallback.h"
+#include "zrtp_session_callback.h"
 
 #include "global.h"
 #include "sip/sipcall.h"
diff --git a/daemon/src/audio/audiortp/ZrtpSessionCallback.h b/daemon/src/audio/audiortp/zrtp_session_callback.h
similarity index 95%
rename from daemon/src/audio/audiortp/ZrtpSessionCallback.h
rename to daemon/src/audio/audiortp/zrtp_session_callback.h
index c4760da20..e8f33af85 100644
--- a/daemon/src/audio/audiortp/ZrtpSessionCallback.h
+++ b/daemon/src/audio/audiortp/zrtp_session_callback.h
@@ -28,8 +28,8 @@
  *  as that of the covered work.
  */
 
-#ifndef __SFL_ZRTP_CALLBACK_H__
-#define __SFL_ZRTP_CALLBACK_H__
+#ifndef __ZRTP_SESSION_CALLBACK_H__
+#define __ZRTP_SESSION_CALLBACK_H__
 #include <cstddef>
 
 using std::ptrdiff_t;
@@ -66,4 +66,4 @@ class ZrtpSessionCallback: public ZrtpUserCallback {
         static bool _mapInitialized;
 };
 }
-#endif
+#endif // __ZRTP_SESSION_CALLBACK_H__
diff --git a/daemon/src/dbus/callmanager.cpp b/daemon/src/dbus/callmanager.cpp
index 07e0a6ac6..a8b449caa 100644
--- a/daemon/src/dbus/callmanager.cpp
+++ b/daemon/src/dbus/callmanager.cpp
@@ -35,8 +35,8 @@
 
 #include "sip/sipcall.h"
 #include "sip/sipvoiplink.h"
-#include "audio/audiortp/AudioRtpFactory.h"
-#include "audio/audiortp/AudioZrtpSession.h"
+#include "audio/audiortp/audio_rtp_factory.h"
+#include "audio/audiortp/audio_zrtp_session.h"
 
 #include "manager.h"
 
diff --git a/daemon/src/sip/sipcall.cpp b/daemon/src/sip/sipcall.cpp
index 33d6f1383..6c2f87cf2 100644
--- a/daemon/src/sip/sipcall.cpp
+++ b/daemon/src/sip/sipcall.cpp
@@ -32,8 +32,7 @@
  */
 
 #include "sipcall.h"
-#include "logger.h" // for _debug
-#include "audio/audiortp/AudioRtpFactory.h"
+#include "audio/audiortp/audio_rtp_factory.h"
 #include "sdp.h"
 
 SIPCall::SIPCall(const std::string& id, Call::CallType type, pj_caching_pool *caching_pool) : Call(id, type)
diff --git a/daemon/src/sip/sipcall.h b/daemon/src/sip/sipcall.h
index 9f36dd4d7..5f20bbf47 100644
--- a/daemon/src/sip/sipcall.h
+++ b/daemon/src/sip/sipcall.h
@@ -33,8 +33,7 @@
 #define SIPCALL_H
 
 #include "call.h"
-#include <cassert>
-#include "audio/audiortp/AudioRtpFactory.h"
+#include "audio/audiortp/audio_rtp_factory.h"
 
 class pjsip_evsub;
 class pj_caching_pool;
diff --git a/daemon/test/rtptest.cpp b/daemon/test/rtptest.cpp
index 0e0a751cd..11ab28077 100644
--- a/daemon/test/rtptest.cpp
+++ b/daemon/test/rtptest.cpp
@@ -42,18 +42,16 @@
 #include <time.h>
 
 #include "rtptest.h"
-#include "audio/audiortp/AudioSymmetricRtpSession.h"
+#include "audio/audiortp/audio_symmetric_rtp_session.h"
 
 #include <unistd.h>
 
 void RtpTest::setUp()
 {
-
 }
 
 bool RtpTest::pjsipInit()
 {
-
     return true;
 }
 
diff --git a/daemon/test/rtptest.h b/daemon/test/rtptest.h
index 6401926dd..e95991416 100644
--- a/daemon/test/rtptest.h
+++ b/daemon/test/rtptest.h
@@ -51,7 +51,7 @@
 #include <pjnath/stun_config.h>
 
 // Application import
-#include "audio/audiortp/AudioRtpFactory.h"
+#include "audio/audiortp/audio_rtp_factory.h"
 #include "manager.h"
 #include "call.h"
 #include "sip/sipcall.h"