diff --git a/scripts/base/frameworks/storage/main.zeek b/scripts/base/frameworks/storage/main.zeek
index a1793dac37..75d72fe706 100644
--- a/scripts/base/frameworks/storage/main.zeek
+++ b/scripts/base/frameworks/storage/main.zeek
@@ -9,7 +9,7 @@ export {
 	## to add relevant fields to it.
 	type BackendOptions: record {
 		## The serializer used for converting Zeek data.
-		serializer: Storage::Serializer &default=Storage::JSON;
+		serializer: Storage::Serializer &default=Storage::STORAGE_SERIALIZER_JSON;
 	};
 
 	## Record for passing arguments to :zeek:see:`Storage::Async::put` and
diff --git a/src/storage/Component.cc b/src/storage/Component.cc
index cc0ee4cc4c..1847843c62 100644
--- a/src/storage/Component.cc
+++ b/src/storage/Component.cc
@@ -14,7 +14,7 @@ BackendComponent::BackendComponent(const std::string& name, factory_callback arg
 
 void BackendComponent::Initialize() {
     InitializeTag();
-    storage_mgr->BackendMgr().RegisterComponent(this);
+    storage_mgr->BackendMgr().RegisterComponent(this, "STORAGE_BACKEND_");
 }
 
 void BackendComponent::DoDescribe(ODesc* d) const {
@@ -29,7 +29,7 @@ SerializerComponent::SerializerComponent(const std::string& name, factory_callba
 
 void SerializerComponent::Initialize() {
     InitializeTag();
-    storage_mgr->SerializerMgr().RegisterComponent(this);
+    storage_mgr->SerializerMgr().RegisterComponent(this, "STORAGE_SERIALIZER_");
 }
 
 void SerializerComponent::DoDescribe(ODesc* d) const {
diff --git a/testing/btest/Baseline/plugins.storage/output b/testing/btest/Baseline/plugins.storage/output
index 89c4f9ab07..fbd1a0ecda 100644
--- a/testing/btest/Baseline/plugins.storage/output
+++ b/testing/btest/Baseline/plugins.storage/output
@@ -10,7 +10,7 @@ get result after erase, [code=Storage::KEY_NOT_FOUND, error_str=<uninitialized>,
 close result, [code=Storage::SUCCESS, error_str=<uninitialized>, value=<uninitialized>]
 results of trying to use closed handle: get: Storage::NOT_CONNECTED, put: Storage::NOT_CONNECTED, erase: Storage::NOT_CONNECTED
 
-open result 2, [code=Storage::OPERATION_FAILED, error_str=Failed to open backend Storage::STORAGEDUMMY: open_fail was set to true, returning error, value=<opaque of BackendHandleVal>]
+open result 2, [code=Storage::OPERATION_FAILED, error_str=Failed to open backend Storage::STORAGE_BACKEND_STORAGEDUMMY: open_fail was set to true, returning error, value=<opaque of BackendHandleVal>]
 close result on closed handle, [code=Storage::NOT_CONNECTED, error_str=Backend is closed, value=<uninitialized>]
 
 open result 3, [code=Storage::SUCCESS, error_str=<uninitialized>, value=<opaque of BackendHandleVal>]
diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-disconnect/out b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-disconnect/out
index d87e524a8b..a62108de4f 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-disconnect/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-disconnect/out
@@ -1,4 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 open_result, [code=Storage::SUCCESS, error_str=<uninitialized>, value=<opaque of BackendHandleVal>]
-Storage::backend_opened, Storage::REDIS, [serializer=Storage::JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]]
-Storage::backend_lost, Storage::REDIS, [serializer=Storage::JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]], Server closed the connection
+Storage::backend_opened, Storage::STORAGE_BACKEND_REDIS, [serializer=Storage::STORAGE_SERIALIZER_JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]]
+Storage::backend_lost, Storage::STORAGE_BACKEND_REDIS, [serializer=Storage::STORAGE_SERIALIZER_JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]], Server closed the connection
diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out
index 52cc495f62..5bd50b0b4e 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out
@@ -9,5 +9,5 @@ get result same as originally inserted, T
 put result, [code=Storage::SUCCESS, error_str=<uninitialized>, value=<uninitialized>]
 get result, [code=Storage::SUCCESS, error_str=<uninitialized>, value=value2345]
 get result same as overwritten, T
-Storage::backend_opened, Storage::REDIS, [serializer=Storage::JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]]
-Storage::backend_lost, Storage::REDIS, [serializer=Storage::JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]], Client disconnected
+Storage::backend_opened, Storage::STORAGE_BACKEND_REDIS, [serializer=Storage::STORAGE_SERIALIZER_JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]]
+Storage::backend_lost, Storage::STORAGE_BACKEND_REDIS, [serializer=Storage::STORAGE_SERIALIZER_JSON, redis=[server_host=127.0.0.1, server_port=xxxx/tcp, server_unix_socket=<uninitialized>, key_prefix=testing]], Client disconnected
diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-basic/out b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-basic/out
index 8ad2a12b65..7121683d22 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-basic/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-basic/out
@@ -1,5 +1,5 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-Storage::backend_opened, Storage::SQLITE, [serializer=Storage::JSON, sqlite=[database_path=test.sqlite, table_name=testing, tuning_params={
+Storage::backend_opened, Storage::STORAGE_BACKEND_SQLITE, [serializer=Storage::STORAGE_SERIALIZER_JSON, sqlite=[database_path=test.sqlite, table_name=testing, tuning_params={
 [synchronous] = normal,
 [temp_store] = memory,
 [journal_mode] = WAL
diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-error-handling/out b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-error-handling/out
index 0f0dfe41cb..b295efbe65 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-error-handling/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-error-handling/out
@@ -1,5 +1,5 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-Open result, [code=Storage::OPERATION_FAILED, error_str=Failed to open backend Storage::SQLITE: SQLite call failed: unable to open database file, value=<opaque of BackendHandleVal>]
+Open result, [code=Storage::OPERATION_FAILED, error_str=Failed to open backend Storage::STORAGE_BACKEND_SQLITE: SQLite call failed: unable to open database file, value=<opaque of BackendHandleVal>]
 Open result 2, [code=Storage::SUCCESS, error_str=<uninitialized>, value=<opaque of BackendHandleVal>]
 Put result with bad key type, [code=Storage::KEY_TYPE_MISMATCH, error_str=<uninitialized>, value=<uninitialized>]
 Put result on closed handle, [code=Storage::NOT_CONNECTED, error_str=Backend is closed, value=<uninitialized>]
diff --git a/testing/btest/plugins/storage.zeek b/testing/btest/plugins/storage.zeek
index 2089497d9f..86a927f8ef 100644
--- a/testing/btest/plugins/storage.zeek
+++ b/testing/btest/plugins/storage.zeek
@@ -28,7 +28,7 @@ event zeek_init() {
 	local value = "value5678";
 
 	# Basic operation. Open, put, and get the value back.
-	local res = Storage::Sync::open_backend(Storage::STORAGEDUMMY, opts, string, string);
+	local res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_STORAGEDUMMY, opts, string, string);
 	print "open result", res;
 	local b = res$value;
 
@@ -63,7 +63,7 @@ event zeek_init() {
 
 	# Test failing to open the handle and test closing an invalid handle.
 	opts$dummy = [$open_fail = T, $timeout_put = F];
-	res = Storage::Sync::open_backend(Storage::STORAGEDUMMY, opts, string, string);
+	res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_STORAGEDUMMY, opts, string, string);
 	print "open result 2", res;
 	res = Storage::Sync::close_backend(res$value);
 	print "close result on closed handle", res;
@@ -71,7 +71,7 @@ event zeek_init() {
 
 	# Test timing out an async put request.
 	opts$dummy = [$open_fail = F, $timeout_put = T];
-	res = Storage::Sync::open_backend(Storage::STORAGEDUMMY, opts, string, string);
+	res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_STORAGEDUMMY, opts, string, string);
 	print "open result 3", res;
 	b = res$value;
 
diff --git a/testing/btest/scripts/base/frameworks/storage/compound-types.zeek b/testing/btest/scripts/base/frameworks/storage/compound-types.zeek
index 419a1f3fc0..bb6af79c02 100644
--- a/testing/btest/scripts/base/frameworks/storage/compound-types.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/compound-types.zeek
@@ -63,7 +63,7 @@ event zeek_init() {
 	value[2] = "b";
 	value[3] = "c";
 
-	local open_res = Storage::Sync::open_backend(Storage::SQLITE, opts, Rec, tbl);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, Rec, tbl);
 	print "open result", open_res;
 	local b = open_res$value;
 
diff --git a/testing/btest/scripts/base/frameworks/storage/erase.zeek b/testing/btest/scripts/base/frameworks/storage/erase.zeek
index 772b910855..b1b38bd77c 100644
--- a/testing/btest/scripts/base/frameworks/storage/erase.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/erase.zeek
@@ -17,7 +17,7 @@ event zeek_init()
 
 	# Test inserting/retrieving a key/value pair that we know won't be in
 	# the backend yet.
-	local open_res = Storage::Sync::open_backend(Storage::SQLITE, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, string, string);
 	print "open result", open_res;
 	local b = open_res$value;
 
diff --git a/testing/btest/scripts/base/frameworks/storage/expiration.zeek b/testing/btest/scripts/base/frameworks/storage/expiration.zeek
index 857830233d..27b89e1f02 100644
--- a/testing/btest/scripts/base/frameworks/storage/expiration.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/expiration.zeek
@@ -33,7 +33,7 @@ event setup_test()
 	local opts : Storage::BackendOptions;
 	opts$sqlite = [$database_path = "storage-test.sqlite", $table_name = "testing"];
 
-	local open_res = Storage::Sync::open_backend(Storage::SQLITE, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, string, string);
 	print "open result", open_res;
 
 	b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/overwriting.zeek b/testing/btest/scripts/base/frameworks/storage/overwriting.zeek
index 8e801a9d7c..75b0484cf8 100644
--- a/testing/btest/scripts/base/frameworks/storage/overwriting.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/overwriting.zeek
@@ -18,7 +18,7 @@ event zeek_init() {
 	local value = "value7890";
 	local value2 = "value2345";
 
-	local res = Storage::Sync::open_backend(Storage::SQLITE, opts, str, str);
+	local res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, str, str);
 	print "open result", res;
 	local b = res$value;
 
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-async-reading-pcap.zeek b/testing/btest/scripts/base/frameworks/storage/redis-async-reading-pcap.zeek
index 85b20450f5..d401029baf 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-async-reading-pcap.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-async-reading-pcap.zeek
@@ -22,7 +22,7 @@ event zeek_init()
 	local key = "key1234";
 	local value = "value5678";
 
-	local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	print "open result", open_res;
 	local b = open_res$value;
 
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-async.zeek b/testing/btest/scripts/base/frameworks/storage/redis-async.zeek
index 5a2339fadc..881a5b9ae4 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-async.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-async.zeek
@@ -25,7 +25,7 @@ event zeek_init()
 	local value = "value5678";
 
 	when [opts, key, value] ( local open_res = Storage::Async::open_backend(
-	    Storage::REDIS, opts, string, string) )
+	    Storage::STORAGE_BACKEND_REDIS, opts, string, string) )
 		{
 		print "open result", open_res;
 		local b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek
index c2d437400f..6a0efc16d2 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek
@@ -40,7 +40,7 @@ event zeek_init()
 	opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
 	    "REDIS_PORT")), $key_prefix="testing" ];
 
-	local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	backend = open_res$value;
 	}
 
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-disconnect.zeek b/testing/btest/scripts/base/frameworks/storage/redis-disconnect.zeek
index 55a8f2c320..5c44d27644 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-disconnect.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-disconnect.zeek
@@ -26,14 +26,14 @@ event Storage::backend_lost(tag: Storage::Backend, config: any, reason: string)
 event zeek_init()
 	{
 	local opts: Storage::BackendOptions;
-	opts$serializer = Storage::JSON;
+	opts$serializer = Storage::STORAGE_SERIALIZER_JSON;
 	opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
 	    "REDIS_PORT")), $key_prefix="testing" ];
 
 	local key = "key1234";
 	local value = "value1234";
 
-	local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	print "open_result", open_res;
 
 	# Kill the redis server so the backend will disconnect and fire the backend_lost event.
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-erase.zeek b/testing/btest/scripts/base/frameworks/storage/redis-erase.zeek
index bb6f09b477..65a64d6787 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-erase.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-erase.zeek
@@ -21,7 +21,7 @@ event zeek_init()
 	local key = "key1234";
 	local value = "value1234";
 
-	local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	print "open_result", open_res;
 
 	local b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-expiration.zeek b/testing/btest/scripts/base/frameworks/storage/redis-expiration.zeek
index ed287aabeb..2951838c9c 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-expiration.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-expiration.zeek
@@ -40,7 +40,7 @@ event setup_test()
 	opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
 	    "REDIS_PORT")), $key_prefix="testing" ];
 
-	local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	print "open result", open_res;
 
 	b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-native-expiration.zeek b/testing/btest/scripts/base/frameworks/storage/redis-native-expiration.zeek
index 146f89d948..6931d1fe51 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-native-expiration.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-native-expiration.zeek
@@ -40,7 +40,7 @@ event setup_test()
 	opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
 	    "REDIS_PORT")), $key_prefix="testing" ];
 
-	local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	print "open result", open_res;
 
 	b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-sync.zeek b/testing/btest/scripts/base/frameworks/storage/redis-sync.zeek
index e19503df5d..2f09ddae44 100644
--- a/testing/btest/scripts/base/frameworks/storage/redis-sync.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/redis-sync.zeek
@@ -24,7 +24,7 @@ event Storage::backend_lost(tag: Storage::Backend, config: any, reason: string)
 event zeek_init()
 	{
 	local opts: Storage::BackendOptions;
-	opts$serializer = Storage::JSON;
+	opts$serializer = Storage::STORAGE_SERIALIZER_JSON;
 	opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
 	    "REDIS_PORT")), $key_prefix="testing" ];
 
@@ -32,7 +32,7 @@ event zeek_init()
 	local value = "value1234";
 	local value2 = "value2345";
 
-	local res = Storage::Sync::open_backend(Storage::REDIS, opts, string, string);
+	local res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
 	print "open_result", res;
 
 	local b = res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/sqlite-basic-reading-pcap.zeek b/testing/btest/scripts/base/frameworks/storage/sqlite-basic-reading-pcap.zeek
index 764c9ea8cc..38ac20234b 100644
--- a/testing/btest/scripts/base/frameworks/storage/sqlite-basic-reading-pcap.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/sqlite-basic-reading-pcap.zeek
@@ -20,7 +20,7 @@ event zeek_init()
 
 	# Test inserting/retrieving a key/value pair that we know won't be in
 	# the backend yet.
-	local open_res = Storage::Sync::open_backend(Storage::SQLITE, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, string, string);
 	print "open result", open_res;
 
 	local b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/sqlite-basic-sync-in-when.zeek b/testing/btest/scripts/base/frameworks/storage/sqlite-basic-sync-in-when.zeek
index b127c23919..3e4d12e421 100644
--- a/testing/btest/scripts/base/frameworks/storage/sqlite-basic-sync-in-when.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/sqlite-basic-sync-in-when.zeek
@@ -24,7 +24,7 @@ event zeek_init()
 	# Test inserting/retrieving a key/value pair that we know won't be in
 	# the backend yet.
 	when [opts, key, value] ( local open_res = Storage::Sync::open_backend(
-	    Storage::SQLITE, opts, string, string) )
+	    Storage::STORAGE_BACKEND_SQLITE, opts, string, string) )
 		{
 		print "open result", open_res;
 		local b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/sqlite-basic.zeek b/testing/btest/scripts/base/frameworks/storage/sqlite-basic.zeek
index 2e6a815f97..977b31d71b 100644
--- a/testing/btest/scripts/base/frameworks/storage/sqlite-basic.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/sqlite-basic.zeek
@@ -16,7 +16,7 @@ event zeek_init()
 	{
 	# Create a database file in the .tmp directory with a 'testing' table
 	local opts: Storage::BackendOptions;
-	opts$serializer = Storage::JSON;
+	opts$serializer = Storage::STORAGE_SERIALIZER_JSON;
 	opts$sqlite = [ $database_path="test.sqlite", $table_name="testing" ];
 
 	local key = "key1234";
@@ -25,7 +25,7 @@ event zeek_init()
 	# Test inserting/retrieving a key/value pair that we know won't be in
 	# the backend yet.
 	when [opts, key, value] ( local open_res = Storage::Async::open_backend(
-	    Storage::SQLITE, opts, string, string) )
+	    Storage::STORAGE_BACKEND_SQLITE, opts, string, string) )
 		{
 		print "open result", open_res;
 		local b = open_res$value;
diff --git a/testing/btest/scripts/base/frameworks/storage/sqlite-error-handling.zeek b/testing/btest/scripts/base/frameworks/storage/sqlite-error-handling.zeek
index e85a179cf2..0c216405c1 100644
--- a/testing/btest/scripts/base/frameworks/storage/sqlite-error-handling.zeek
+++ b/testing/btest/scripts/base/frameworks/storage/sqlite-error-handling.zeek
@@ -14,12 +14,12 @@ event zeek_init() {
 	               $table_name = "testing"];
 
 	# This should report an error in .stderr and reporter.log
-	local open_res = Storage::Sync::open_backend(Storage::SQLITE, opts, string, string);
+	local open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, string, string);
 	print "Open result", open_res;
 
 	# Open a valid database file
 	opts$sqlite$database_path = "test.sqlite";
-	open_res = Storage::Sync::open_backend(Storage::SQLITE, opts, string, string);
+	open_res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_SQLITE, opts, string, string);
 	print "Open result 2", open_res;
 
 	local b = open_res$value;