diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 915c273..9b627a2 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -20,14 +20,14 @@ jobs:
         with:
           go-version: "1.23"
 
-      - name: Clone logos-messaging-nim
+      - name: Clone logos-delivery
         run: |
           mkdir -p vendor
-          git clone --depth 1 https://github.com/logos-messaging/logos-messaging-nim.git vendor/logos-messaging-nim
+          git clone --depth 1 https://github.com/logos-messaging/logos-delivery.git vendor/logos-delivery
 
       - name: Build libwaku
         run: |
-          cd vendor/logos-messaging-nim
+          cd vendor/logos-delivery
           echo "Building libwaku in $(pwd)"
           make libwaku -j
           cd ../..
@@ -46,7 +46,7 @@ jobs:
 
       - name: Build waku bindings
         run: |
-          export LMN_DIR=$(pwd)/vendor/logos-messaging-nim
+          export LMN_DIR=$(pwd)/vendor/logos-delivery
           export CGO_CFLAGS="-I${LMN_DIR}/library/"
           export CGO_LDFLAGS="-L${LMN_DIR}/build/ -lwaku -Wl,-rpath,${LMN_DIR}/build/" 
           make -C waku build
@@ -58,7 +58,7 @@ jobs:
         run: |
           set -euo pipefail
           cd waku
-          export LMN_DIR=$(pwd)/vendor/logos-messaging-nim
+          export LMN_DIR=$(pwd)/vendor/logos-delivery
           export CGO_CFLAGS="-I${LMN_DIR}/library/"
           export CGO_LDFLAGS="-L${LMN_DIR}/build/ -lwaku -Wl,-rpath,${LMN_DIR}/build/"
           go test -count=10 -p=1 -v -timeout=360m . | tee ../testlogs.log
diff --git a/.github/workflows/CI_endurance.yml b/.github/workflows/CI_endurance.yml
index 4cd4054..66ae899 100644
--- a/.github/workflows/CI_endurance.yml
+++ b/.github/workflows/CI_endurance.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Build libwaku
         run: |
-          cd vendor/logos-messaging-nim
+          cd vendor/logos-delivery
           make libwaku
 
       - name: Build waku bindings
@@ -94,7 +94,7 @@ jobs:
 
       - name: Build libwaku
         run: |
-          cd vendor/logos-messaging-nim
+          cd vendor/logos-delivery
           make libwaku
 
       - name: Build waku bindings
diff --git a/.github/workflows/Repeated_tests_endurancce.yml b/.github/workflows/Repeated_tests_endurancce.yml
index 2ad7e31..449d9da 100644
--- a/.github/workflows/Repeated_tests_endurancce.yml
+++ b/.github/workflows/Repeated_tests_endurancce.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Build libwaku
         run: |
-          cd vendor/logos-messaging-nim
+          cd vendor/logos-delivery
           make libwaku
 
       - name: Build waku bindings
diff --git a/.gitmodules b/.gitmodules
index fdd82ee..4378da6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "vendor/nwaku"]
-	path = vendor/nwaku
-	url = https://github.com/logos-messaging/logos-messaging-nim.git
+[submodule "vendor/logos-delivery"]
+	path = vendor/logos-delivery
+	url = https://github.com/logos-messaging/logos-delivery.git
diff --git a/README.md b/README.md
index d60829d..07412ab 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,24 @@
-# Waku Go Bindings
+# logos-delivery Go Bindings
 
 Go bindings for the Waku library.
 
 ## Install
 
 ```
-go get -u github.com/logos-messaging/logos-messaging-go-bindings
+go get -u github.com/logos-messaging/logos-delivery-go-bindings
 ```
 
 ## Building & Dependencies
 
-`libwaku` (from `logos-messaging-nim`) is required at compile-time.
+`libwaku` (from `logos-delivery`) is required at compile-time.
 
 ### Building with Makefile
 
-If you have `logos-messaging-nim` checked out, point the build to it:
+If you have `logos-delivery` checked out, point the build to it:
 
 ```bash
-# path to your existing logos-messaging-nim clone
-export LMN_DIR=/absolute/path/to/logos-messaging-nim
+# path to your existing logos-delivery clone
+export LMN_DIR=/absolute/path/to/logos-delivery
 export CGO_CFLAGS="-I${LMN_DIR}/library"
 export CGO_LDFLAGS="-L${LMN_DIR}/build -lwaku -Wl,-rpath,${LMN_DIR}/build"
 
@@ -34,7 +34,7 @@ make -C waku test TEST=TestConnectedPeersInfo
 
 ## Development
 
-When working on this repository itself, `logos-messaging-nim` is included as a git submodule for convenience.
+When working on this repository itself, `logos-delivery` is included as a git submodule for convenience.
 
 - Initialize and update the submodule, then build `libwaku`
     ```sh
diff --git a/waku/Makefile b/waku/Makefile
index 4011a6f..211ed8e 100644
--- a/waku/Makefile
+++ b/waku/Makefile
@@ -1,7 +1,7 @@
 # Makefile for Waku Go Bindings
 
-# Path to logos-messaging-nim (nwaku) submodule
-export LMN_DIR ?= $(shell pwd)/../vendor/logos-messaging-nim
+# Path to logos-delivery submodule
+export LMN_DIR ?= $(shell pwd)/../vendor/logos-delivery
 
 # Debugging output
 print-paths:
diff --git a/waku/waku-bindings b/waku/waku-bindings
new file mode 100644
index 0000000..ae10486
Binary files /dev/null and b/waku/waku-bindings differ