diff --git a/plugins/plugin_mfs_wip.cpp b/plugins/plugin_mfs_wip.cpp
index 99ad5a4..ac22607 100644
--- a/plugins/plugin_mfs_wip.cpp
+++ b/plugins/plugin_mfs_wip.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 
 static std::unique_ptr<MessageFragmentStore> g_mfs = nullptr;
-static std::unique_ptr<backend::FilesystemStorage> g_fsb = nullptr;
+static std::unique_ptr<Backends::FilesystemStorage> g_fsb = nullptr;
 
 constexpr const char* plugin_name = "MessageFragmentStore";
 
@@ -41,7 +41,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
 
 		// static store, could be anywhere tho
 		// construct with fetched dependencies
-		g_fsb = std::make_unique<backend::FilesystemStorage>(*os, "test2_message_store/"); // TODO: use config?
+		g_fsb = std::make_unique<Backends::FilesystemStorage>(*os, "test2_message_store/"); // TODO: use config?
 		g_mfs = std::make_unique<MessageFragmentStore>(*cr, *rmm, *os, *g_fsb, *msnj);
 
 		// register types
diff --git a/src/convert_frag_to_obj.cpp b/src/convert_frag_to_obj.cpp
index 54746e5..9700a01 100644
--- a/src/convert_frag_to_obj.cpp
+++ b/src/convert_frag_to_obj.cpp
@@ -30,8 +30,8 @@ int main(int argc, const char** argv) {
 	ObjectStore2 os_src;
 	ObjectStore2 os_dst;
 
-	backend::FilesystemStorage fsb_src(os_src, argv[1]);
-	backend::FilesystemStorage fsb_dst(os_dst, argv[2]);
+	Backends::FilesystemStorage fsb_src(os_src, argv[1]);
+	Backends::FilesystemStorage fsb_dst(os_dst, argv[2]);
 
 	Contact3Registry cr; // dummy
 	RegistryMessageModel rmm(cr); // dummy
@@ -47,16 +47,16 @@ int main(int argc, const char** argv) {
 	// hookup events
 	struct EventListener : public ObjectStoreEventI {
 		ObjectStore2& _os_src;
-		backend::FilesystemStorage& _fsb_src;
+		Backends::FilesystemStorage& _fsb_src;
 
 		ObjectStore2& _os_dst;
-		backend::FilesystemStorage& _fsb_dst;
+		Backends::FilesystemStorage& _fsb_dst;
 
 		EventListener(
 			ObjectStore2& os_src,
-			backend::FilesystemStorage& fsb_src,
+			Backends::FilesystemStorage& fsb_src,
 			ObjectStore2& os_dst,
-			backend::FilesystemStorage& fsb_dst
+			Backends::FilesystemStorage& fsb_dst
 		) :
 			_os_src(os_src),
 			_fsb_src(fsb_src),