diff --git a/src/media/audio/audio_input.cpp b/src/media/audio/audio_input.cpp
index 295f1a95025d33e51d2f255d0b5e0bc1f7aab3a4..8aba3472e6cd16ca5d10a63819c5d17897238643 100644
--- a/src/media/audio/audio_input.cpp
+++ b/src/media/audio/audio_input.cpp
@@ -27,7 +27,7 @@
 #include "manager.h"
 #include "smartools.h"
 
-namespace ring { namespace audio {
+namespace ring {
 
 AudioInput::AudioInput(const std::string& id) :
     id_(id),
@@ -121,4 +121,4 @@ AudioInput::initRecorder(const std::shared_ptr<MediaRecorder>& rec)
     recorder_ = rec;
 }
 
-}} // namespace ring::audio
+} // namespace ring
diff --git a/src/media/audio/audio_input.h b/src/media/audio/audio_input.h
index 040d68e9ce5d9a072dfcd22b655fb25e88329bfe..abc3647adfd892a6119e841060cd4868b4c07f51 100644
--- a/src/media/audio/audio_input.h
+++ b/src/media/audio/audio_input.h
@@ -29,7 +29,7 @@ namespace ring {
 class MediaRecorder;
 }
 
-namespace ring { namespace audio {
+namespace ring {
 
 class AudioInput
 {
@@ -57,4 +57,4 @@ private:
     void cleanup();
 };
 
-}} // namespace ring::audio
+} // namespace ring
diff --git a/src/media/localrecorder.cpp b/src/media/localrecorder.cpp
index 1e93a7ac33874d96e7c3c71d01b8a21c957e7361..345fb9ed250233c16a0ca22925998a07462fc78f 100644
--- a/src/media/localrecorder.cpp
+++ b/src/media/localrecorder.cpp
@@ -74,7 +74,7 @@ LocalRecorder::startRecording()
     ring::Manager::instance().startAudioDriverStream();
     // TODO wait for AudioLayer::hardwareFormatAvailable callback, otherwise a race condition happens here
 
-    audioInput_.reset(new ring::audio::AudioInput(RingBufferPool::DEFAULT_ID));
+    audioInput_.reset(new ring::AudioInput(RingBufferPool::DEFAULT_ID));
     audioInput_->initRecorder(recorder_);
 
 #ifdef RING_VIDEO
diff --git a/src/media/localrecorder.h b/src/media/localrecorder.h
index 92a5e635649429fd6dc2cb67af5d5fab91020523..81be4e9733764c0e81e27cda26b8af63f28d29b7 100644
--- a/src/media/localrecorder.h
+++ b/src/media/localrecorder.h
@@ -63,7 +63,7 @@ class LocalRecorder : public Recordable {
     private:
         bool videoInputSet_ = false;
         std::weak_ptr<ring::video::VideoInput> videoInput_;
-        std::unique_ptr<ring::audio::AudioInput> audioInput_ = nullptr;
+        std::unique_ptr<ring::AudioInput> audioInput_ = nullptr;
         std::string path_;
 };