diff --git a/firmware/application/capture_thread.cpp b/firmware/application/capture_thread.cpp
index 4de5cd53..a5751ac7 100644
--- a/firmware/application/capture_thread.cpp
+++ b/firmware/application/capture_thread.cpp
@@ -75,7 +75,7 @@ StreamOutput::~StreamOutput() {
 Thread* CaptureThread::thread = nullptr;
 
 CaptureThread::CaptureThread(
-	std::unique_ptr<Writer> writer,
+	std::unique_ptr<stream::Writer> writer,
 	size_t write_size,
 	size_t buffer_count,
 	std::function<void()> success_callback,
diff --git a/firmware/application/capture_thread.hpp b/firmware/application/capture_thread.hpp
index e867e4ec..01c45b2e 100644
--- a/firmware/application/capture_thread.hpp
+++ b/firmware/application/capture_thread.hpp
@@ -36,7 +36,7 @@
 class CaptureThread {
 public:
 	CaptureThread(
-		std::unique_ptr<Writer> writer,
+		std::unique_ptr<stream::Writer> writer,
 		size_t write_size,
 		size_t buffer_count,
 		std::function<void()> success_callback,
@@ -54,7 +54,7 @@ private:
 	static constexpr auto event_mask_loop_wake = EVENT_MASK(0);
 
 	CaptureConfig config;
-	std::unique_ptr<Writer> writer;
+	std::unique_ptr<stream::Writer> writer;
 	std::function<void()> success_callback;
 	std::function<void(File::Error)> error_callback;
 	static Thread* thread;
diff --git a/firmware/application/io.hpp b/firmware/application/io.hpp
index 8e21d19f..5c29da9d 100644
--- a/firmware/application/io.hpp
+++ b/firmware/application/io.hpp
@@ -23,6 +23,8 @@
 
 #include "file.hpp"
 
+namespace stream {
+
 class Reader {
 public:
 	virtual File::Result<File::Size> read(void* const buffer, const File::Size bytes) = 0;
@@ -34,3 +36,5 @@ public:
 	virtual File::Result<File::Size> write(const void* const buffer, const File::Size bytes) = 0;
 	virtual ~Writer() = default;
 };
+
+} /* namespace stream */
diff --git a/firmware/application/io_file.hpp b/firmware/application/io_file.hpp
index f0647caf..c9049dde 100644
--- a/firmware/application/io_file.hpp
+++ b/firmware/application/io_file.hpp
@@ -28,7 +28,7 @@
 
 #include <cstdint>
 
-class FileWriter : public Writer {
+class FileWriter : public stream::Writer {
 public:
 	FileWriter() = default;
 
diff --git a/firmware/application/ui_record_view.cpp b/firmware/application/ui_record_view.cpp
index 48d48659..d617ac39 100644
--- a/firmware/application/ui_record_view.cpp
+++ b/firmware/application/ui_record_view.cpp
@@ -117,7 +117,7 @@ void RecordView::start() {
 		return;
 	}
 
-	std::unique_ptr<Writer> writer;
+	std::unique_ptr<stream::Writer> writer;
 	switch(file_type) {
 	case FileType::WAV:
 		{