diff --git a/indexedDb/channels/init.go b/indexedDb/channels/init.go
index 292a596148035af097b19a3e1f1909938251268e..586d9fdff4cdb32c9ad64797c68d3e6a8bca99f7 100644
--- a/indexedDb/channels/init.go
+++ b/indexedDb/channels/init.go
@@ -55,7 +55,7 @@ func NewWASMEventModel(path string, encryption cryptoChannel.Cipher,
 
 	// TODO: bring in URL and name from caller
 	wh, err := indexedDb.NewWorkerHandler(
-		WorkerJavascriptFileURL, "indexedDbWorker")
+		WorkerJavascriptFileURL, "channelsIndexedDb")
 	if err != nil {
 		return nil, err
 	}
diff --git a/indexedDb/dm/init.go b/indexedDb/dm/init.go
index 827d6a9e8a920187756a2d82d77eb880f9529e4d..f3bc313ed97dfd0755b36f25a7adc6bd74e746aa 100644
--- a/indexedDb/dm/init.go
+++ b/indexedDb/dm/init.go
@@ -46,7 +46,7 @@ func NewWASMEventModel(path string, encryption cryptoChannel.Cipher,
 
 	// TODO: bring in URL and name from caller
 	wh, err := indexedDb.NewWorkerHandler(
-		WorkerJavascriptFileURL, "indexedDbWorker")
+		WorkerJavascriptFileURL, "dmIndexedDb")
 	if err != nil {
 		return nil, err
 	}
diff --git a/indexedDb/tag.go b/indexedDb/tag.go
index 0fbd54c44eb090e0c0209dbc1b282fc988c6528d..f89763702620a140f0a014032131770c50ce5d5e 100644
--- a/indexedDb/tag.go
+++ b/indexedDb/tag.go
@@ -5,6 +5,8 @@
 // LICENSE file.                                                              //
 ////////////////////////////////////////////////////////////////////////////////
 
+//go:build js && wasm
+
 package indexedDb
 
 // Tag describes how a message sent to or from the worker should be handled.
diff --git a/indexedDbWorker/channels/handlers.go b/indexedDbWorker/channels/handlers.go
index 7d997e746168aa50ba12240f66ea2d68df3d51ed..b4ba0fcbab623fbfab14f3393392150491749729 100644
--- a/indexedDbWorker/channels/handlers.go
+++ b/indexedDbWorker/channels/handlers.go
@@ -5,6 +5,8 @@
 // LICENSE file.                                                              //
 ////////////////////////////////////////////////////////////////////////////////
 
+//go:build js && wasm
+
 package main
 
 import (
diff --git a/indexedDbWorker/channels/main.go b/indexedDbWorker/channels/main.go
index 5610d4d69dfe4c0a3461be5182a0f3018502bd12..d720ddee52b525d98d1f6027927dd8b750182054 100644
--- a/indexedDbWorker/channels/main.go
+++ b/indexedDbWorker/channels/main.go
@@ -5,6 +5,8 @@
 // LICENSE file.                                                              //
 ////////////////////////////////////////////////////////////////////////////////
 
+//go:build js && wasm
+
 package main
 
 import (
diff --git a/indexedDbWorker/dm/handlers.go b/indexedDbWorker/dm/handlers.go
index 7ecebd59d91131493d3ac7f4242b73b71acaed74..52bf98e549b7d3fe0233f5096c27115884566d13 100644
--- a/indexedDbWorker/dm/handlers.go
+++ b/indexedDbWorker/dm/handlers.go
@@ -5,6 +5,8 @@
 // LICENSE file.                                                              //
 ////////////////////////////////////////////////////////////////////////////////
 
+//go:build js && wasm
+
 package main
 
 import (
diff --git a/indexedDbWorker/dm/main.go b/indexedDbWorker/dm/main.go
index 5610d4d69dfe4c0a3461be5182a0f3018502bd12..d720ddee52b525d98d1f6027927dd8b750182054 100644
--- a/indexedDbWorker/dm/main.go
+++ b/indexedDbWorker/dm/main.go
@@ -5,6 +5,8 @@
 // LICENSE file.                                                              //
 ////////////////////////////////////////////////////////////////////////////////
 
+//go:build js && wasm
+
 package main
 
 import (
diff --git a/indexedDbWorker/messageHandler.go b/indexedDbWorker/messageHandler.go
index 7b402d74967beccab060632dec4e51a4a669d289..da05af24cfca4403926f627bf0c54d951eb216a0 100644
--- a/indexedDbWorker/messageHandler.go
+++ b/indexedDbWorker/messageHandler.go
@@ -5,6 +5,8 @@
 // LICENSE file.                                                              //
 ////////////////////////////////////////////////////////////////////////////////
 
+//go:build js && wasm
+
 package indexedDbWorker
 
 import (