diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh
index 2f1268d..15e6d17 100644
--- a/.clusterfuzzlite/build.sh
+++ b/.clusterfuzzlite/build.sh
@@ -2,10 +2,10 @@
 
 set -ex
 
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzConfiguration Fuzz_Configuration fuzz
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzDeserializeRegistrationRequest Fuzz_DeserializeRegistrationRequest fuzz
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzDeserializeRegistrationResponse Fuzz_DeserializeRegistrationResponse fuzz
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzDeserializeRegistrationRecord Fuzz_DeserializeRegistrationRecord fuzz
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzDeserializeKE1 Fuzz_DeserializeKE1 fuzz
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzDeserializeKE2 Fuzz_DeserializeKE2 fuzz
-compile_go_fuzzer github.com/bytemare/opaque/tests FuzzDeserializeKE3 Fuzz_DeserializeKE3 fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzConfiguration Fuzz_Configuration fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzDeserializeRegistrationRequest Fuzz_DeserializeRegistrationRequest fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzDeserializeRegistrationResponse Fuzz_DeserializeRegistrationResponse fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzDeserializeRegistrationRecord Fuzz_DeserializeRegistrationRecord fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzDeserializeKE1 Fuzz_DeserializeKE1 fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzDeserializeKE2 Fuzz_DeserializeKE2 fuzz
+compile_go_fuzzer github.com/bytemare/opaque/opaque_test FuzzDeserializeKE3 Fuzz_DeserializeKE3 fuzz
diff --git a/.github/workflows/cflite_batch.yml b/.github/workflows/cflite_batch.yml
index 21f32dc..61c1b87 100644
--- a/.github/workflows/cflite_batch.yml
+++ b/.github/workflows/cflite_batch.yml
@@ -13,13 +13,13 @@ jobs:
     steps:
       - name: Build Fuzzers (${{ matrix.sanitizer }})
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/build_fuzzers
         with:
           language: go # Change this to the language you are fuzzing.
           sanitizer: ${{ matrix.sanitizer }}
       - name: Run Fuzzers (${{ matrix.sanitizer }})
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/run_fuzzers
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 3600
diff --git a/.github/workflows/cflite_build.yml b/.github/workflows/cflite_build.yml
index 8ed55e5..3a7cbab 100644
--- a/.github/workflows/cflite_build.yml
+++ b/.github/workflows/cflite_build.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Build Fuzzers (${{ matrix.sanitizer }})
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/build_fuzzers
         with:
           language: go # Change this to the language you are fuzzing.
           sanitizer: ${{ matrix.sanitizer }}
diff --git a/.github/workflows/cflite_cron.yml b/.github/workflows/cflite_cron.yml
index 82aa199..82cc1f1 100644
--- a/.github/workflows/cflite_cron.yml
+++ b/.github/workflows/cflite_cron.yml
@@ -9,12 +9,12 @@ jobs:
     steps:
       - name: Build Fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/build_fuzzers
         with:
           language: go # Change this to the language you are fuzzing
       - name: Run Fuzzers
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/run_fuzzers
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 600
@@ -30,13 +30,13 @@ jobs:
     steps:
       - name: Build Fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/build_fuzzers
         with:
           language: go # Change this to the language you are fuzzing.
           sanitizer: coverage
       - name: Run Fuzzers
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/run_fuzzers
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 600
diff --git a/.github/workflows/cflite_pr.yml b/.github/workflows/cflite_pr.yml
index aaa80d9..301ad29 100644
--- a/.github/workflows/cflite_pr.yml
+++ b/.github/workflows/cflite_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Build Fuzzers (${{ matrix.sanitizer }})
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/build_fuzzers
         with:
           language: go # Change this to the language you are fuzzing.
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,7 +30,7 @@ jobs:
           # storage-repo-branch-coverage: gh-pages  # Optional. Defaults to "gh-pages".
       - name: Run Fuzzers (${{ matrix.sanitizer }})
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: google/clusterfuzzlite/actions/run_fuzzers
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 600
diff --git a/tests/client_test.go b/tests/client_test.go
index aa93ee2..78ad059 100644
--- a/tests/client_test.go
+++ b/tests/client_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"log"
diff --git a/tests/deserializer_test.go b/tests/deserializer_test.go
index ce04ff3..4831266 100644
--- a/tests/deserializer_test.go
+++ b/tests/deserializer_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"encoding/hex"
diff --git a/tests/doc.go b/tests/doc.go
index ca8701d..45e3d34 100644
--- a/tests/doc.go
+++ b/tests/doc.go
@@ -1 +1 @@
-package tests
+package opaque_test
diff --git a/tests/encoding_test.go b/tests/encoding_test.go
index f65ee11..63ba793 100644
--- a/tests/encoding_test.go
+++ b/tests/encoding_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"bytes"
diff --git a/tests/fuzz_test.go b/tests/fuzz_test.go
index 9c93f45..485ec13 100644
--- a/tests/fuzz_test.go
+++ b/tests/fuzz_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"crypto"
diff --git a/tests/helper_test.go b/tests/helper_test.go
index 0a41199..580074c 100644
--- a/tests/helper_test.go
+++ b/tests/helper_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"crypto"
diff --git a/tests/opaque_test.go b/tests/opaque_test.go
index 43299f8..e88bc24 100644
--- a/tests/opaque_test.go
+++ b/tests/opaque_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"bytes"
diff --git a/tests/oprf_test.go b/tests/oprf_test.go
index 293140c..c4bedba 100644
--- a/tests/oprf_test.go
+++ b/tests/oprf_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"bytes"
diff --git a/tests/server_test.go b/tests/server_test.go
index c82f050..fdb9af3 100644
--- a/tests/server_test.go
+++ b/tests/server_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"errors"
diff --git a/tests/vectors_test.go b/tests/vectors_test.go
index 3dd0f28..b03d832 100644
--- a/tests/vectors_test.go
+++ b/tests/vectors_test.go
@@ -6,7 +6,7 @@
 // LICENSE file in the root directory of this source tree or at
 // https://spdx.org/licenses/MIT.html
 
-package tests
+package opaque_test
 
 import (
 	"bytes"