diff --git a/.dockerignore b/.dockerignore
index 8553fb7..5355b18 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,7 +5,7 @@
 /demo/
 /dist/
 /rgb-lib/
-/src/rgb_lib/_rgb_lib/librgblibffi.so
+/src/rgb_lib/_rgb_lib/librgblibuniffi.so
 /src/rgb_lib/_rgb_lib/rgb_lib.py
 /build.sh
 /poetry.lock
diff --git a/.gitignore b/.gitignore
index 5ffb9c4..33dca0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 **/__pycache__
 /dist/
 /poetry.lock
-/src/rgb_lib/_rgb_lib/librgblibffi.so
+/src/rgb_lib/_rgb_lib/librgblibuniffi.so
 /src/rgb_lib/_rgb_lib/rgb_lib.py
diff --git a/README.md b/README.md
index 47d081c..96fdbd3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This project builds a Python library, `rgb-lib`, for the [rgb-lib]
 Rust library, which is included as a git submodule. The bindings are created by
-the [rgb-lib-ffi] project, which is located inside the rgb-lib submodule.
+the [rgb-lib-uniffi] project, which is located inside the rgb-lib submodule.
 
 ## Install from PyPI
 
@@ -73,6 +73,6 @@ poetry publish
 
 [cargo]: https://github.com/rust-lang/cargo
 [rgb-lib]: https://github.com/RGB-Tools/rgb-lib
-[rgb-lib-ffi]: https://github.com/RGB-Tools/rgb-lib/tree/master/rgb-lib-ffi
+[rgb-lib-uniffi]: https://github.com/RGB-Tools/rgb-lib/tree/master/bindings/uniffi
 [latest release]: https://pypi.org/project/rgb-lib/
 [poetry]: https://github.com/python-poetry/poetry
diff --git a/demo/Dockerfile b/demo/Dockerfile
index cea5bf5..1015dea 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /home/$USER
 USER $USER
 
 RUN python3 -m pip install --no-warn-script-location \
-    jupyterlab matplotlib python-magic qrcode rgb-lib==0.3.0a4
+    jupyterlab matplotlib python-magic qrcode rgb-lib==0.3.0a6
 
 COPY --chown=$USER:$USER rgb-lib.ipynb sample.png ./
 
diff --git a/generate.sh b/generate.sh
index 231b2b0..f0842fe 100755
--- a/generate.sh
+++ b/generate.sh
@@ -5,14 +5,14 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 PY_SRC="${SCRIPT_DIR}/src/rgb_lib/_rgb_lib/"
 
-RGBLIBFFI_PATH="./rgb-lib/rgb-lib-ffi"
+RGBLIBFFI_PATH="./rgb-lib/bindings/uniffi"
 MANIFEST_PATH=(--manifest-path "$RGBLIBFFI_PATH/Cargo.toml")
 
-echo "Generating librgblibffi.so..."
+echo "Generating librgblibuniffi.so..."
 cargo build "${MANIFEST_PATH[@]}"
-cp "$RGBLIBFFI_PATH/target/debug/librgblibffi.so" "$PY_SRC/"
+cp "$RGBLIBFFI_PATH/target/debug/librgblibuniffi.so" "$PY_SRC/"
 
 echo "Generating rgb_lib.py..."
 cargo run "${MANIFEST_PATH[@]}" \
-    --bin rgb-lib-ffi-bindgen generate $RGBLIBFFI_PATH/src/rgb-lib.udl \
+    --bin rgb-lib-uniffi-bindgen generate $RGBLIBFFI_PATH/src/rgb-lib.udl \
     --out-dir "$PY_SRC" --language python --no-format
diff --git a/pyproject.toml b/pyproject.toml
index 95b9b6b..72bf49e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'rgb-lib'
-version = '0.3.0a4'
+version = '0.3.0a6'
 description = 'RGB Lib Python language bindings.'
 license = 'MIT'
 authors = ['Zoe Faltibà <zoefaltiba@gmail.com>', 'Nicola Busanello <nicola.busanello@gmail.com>']
diff --git a/rgb-lib b/rgb-lib
index bfb159b..ae66c7b 160000
--- a/rgb-lib
+++ b/rgb-lib
@@ -1 +1 @@
-Subproject commit bfb159b842a1ca45987578904cdf75206d7686ad
+Subproject commit ae66c7b7c0859dcafbf77db1d3dad26c5379bba3