diff --git a/.docker/Dockerfile.dev-release b/.docker/Dockerfile.dev-release
index 3167c38a59..74abcb02e3 100644
--- a/.docker/Dockerfile.dev-release
+++ b/.docker/Dockerfile.dev-release
@@ -1,5 +1,6 @@
 FROM docker.io/debian:stable-slim
-WORKDIR /mm2
+WORKDIR /kdf
+COPY target/release/kdf /usr/local/bin/kdf
 COPY target/release/mm2 /usr/local/bin/mm2
 EXPOSE 7783
-CMD ["mm2"]
+CMD ["kdf"]
diff --git a/.docker/Dockerfile.release b/.docker/Dockerfile.release
index 8de75301d6..d9d8d51325 100644
--- a/.docker/Dockerfile.release
+++ b/.docker/Dockerfile.release
@@ -1,5 +1,6 @@
 FROM docker.io/debian:stable-slim
-WORKDIR /mm2
+WORKDIR /kdf
+COPY target/release/kdf /usr/local/bin/kdf
 COPY target/release/mm2 /usr/local/bin/mm2
 EXPOSE 7783
-CMD ["mm2"]
\ No newline at end of file
+CMD ["kdf"]
\ No newline at end of file
diff --git a/.docker/Dockerfile.ubuntu.ci b/.docker/Dockerfile.ubuntu.ci
index 5e86dac8f2..23110a6761 100644
--- a/.docker/Dockerfile.ubuntu.ci
+++ b/.docker/Dockerfile.ubuntu.ci
@@ -18,4 +18,4 @@ RUN \
     chmod -R 777 /root
 
 ENV PATH="/root/.cargo/bin:${PATH}"
-WORKDIR /mm2
\ No newline at end of file
+WORKDIR /kdf
\ No newline at end of file
diff --git a/.dockerignore b/.dockerignore
index 5e4e3785e1..778ad13875 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,6 +6,8 @@ cmake-build-debug
 
 !/target/release/mm2
 !/target/debug/mm2
+!/target/release/kdf
+!/target/debug/kdf
 /mm2src/*/target
 
 /build
@@ -17,6 +19,8 @@ cmake-build-debug
 /js/*.wasm
 /js/mm2
 /js/mm2.exe
+/js/kdf
+/js/kdf.exe
 /wasm-build.log
 
 # Opt out from history in order to speed the `COPY .` up.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 440838e30b..9d788ecc55 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Marketmaker 1.0 bug report
+about: Komodo DeFi Framework bug report
 
 ---
 
@@ -9,10 +9,10 @@ A clear and concise description of what the bug is.
 
 **Please answer following questions and attach requested info - it'll help to solve issue faster**
 - What OS do you use?
-- What marketmaker version do you run?
+- What KDF version do you run?
 - Attach your coins.json config.
 - Provide your enable script with response.
 - Provide other curl scripts (with responses) which were executed prior to error.
-- Attach full marketmaker console logs (start collecting right after marketmaker execution).
+- Attach full KDF console logs (start collecting right after KDF execution).
 - ***Make sure that you don't send your passphrase, userpass and privkeys. Your funds might be stolen if you reveal this info publicly!***
 - Provide info for all nodes involved (e.g. if error occurs during atomic swap you should provide info for both Bob and Alice).
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index b946538d99..1b3dd8f731 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -53,9 +53,9 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --release
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
@@ -65,6 +65,15 @@ jobs:
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          NAME="kdf_$COMMIT_HASH-linux-x86-64.zip"
+          zip $NAME target/release/kdf -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -121,9 +130,9 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release --target x86_64-apple-darwin
+          cargo build --release --target x86_64-apple-darwin
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
@@ -133,6 +142,15 @@ jobs:
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          NAME="kdf_$COMMIT_HASH-mac-x86-64.zip"
+          zip $NAME target/x86_64-apple-darwin/release/kdf -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -178,9 +196,9 @@ jobs:
             remove-item "./MM_VERSION"
           }
           echo $Env:COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --release
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
@@ -190,6 +208,15 @@ jobs:
           mkdir $Env:BRANCH_NAME
           mv $NAME ./$Env:BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          $NAME="kdf_$Env:COMMIT_HASH-win-x86-64.zip"
+          7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
+          mv $NAME ./$Env:BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -236,17 +263,27 @@ jobs:
           echo $COMMIT_HASH > ./MM_VERSION
           cargo rustc --target x86_64-apple-darwin --lib --release --package mm2_bin_lib --crate-type=staticlib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
           NAME="mm2_$COMMIT_HASH-mac-dylib-x86-64.zip"
-          mv target/x86_64-apple-darwin/release/libmm2lib.a target/x86_64-apple-darwin/release/libmm2.a
+          cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
           zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          NAME="kdf_$COMMIT_HASH-mac-dylib-x86-64.zip"
+          mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
+          zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -310,7 +347,7 @@ jobs:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-wasm.zip"
+          NAME="kdf_$COMMIT_HASH-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
@@ -361,17 +398,27 @@ jobs:
           echo $COMMIT_HASH > ./MM_VERSION
           cargo rustc --target aarch64-apple-ios --lib --release --package mm2_bin_lib --crate-type=staticlib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
           NAME="mm2_$COMMIT_HASH-ios-aarch64.zip"
-          mv target/aarch64-apple-ios/release/libmm2lib.a target/aarch64-apple-ios/release/libmm2.a
+          cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
           zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          NAME="kdf_$COMMIT_HASH-ios-aarch64.zip"
+          mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
+          zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -432,17 +479,27 @@ jobs:
           export PATH=$PATH:/android-ndk/bin
           CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --release --crate-type=staticlib --package mm2_bin_lib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
           NAME="mm2_$COMMIT_HASH-android-aarch64.zip"
-          mv target/aarch64-linux-android/release/libmm2lib.a target/aarch64-linux-android/release/libmm2.a
+          cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
           zip $NAME target/aarch64-linux-android/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          NAME="kdf_$COMMIT_HASH-android-aarch64.zip"
+          mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
+          zip $NAME target/aarch64-linux-android/release/libkdf.a -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -503,17 +560,27 @@ jobs:
           export PATH=$PATH:/android-ndk/bin
           CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --release --crate-type=staticlib --package mm2_bin_lib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
           NAME="mm2_$COMMIT_HASH-android-armv7.zip"
-          mv target/armv7-linux-androideabi/release/libmm2lib.a target/armv7-linux-androideabi/release/libmm2.a
+          cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
           zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        env:
+          AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
+        if: ${{ env.AVAILABLE != '' }}
+        run: |
+          NAME="kdf_$COMMIT_HASH-android-armv7.zip"
+          mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
+          zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 725b56374c..326a619bb2 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -53,15 +53,21 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --release
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           NAME="mm2_$COMMIT_HASH-linux-x86-64.zip"
           zip $NAME target/release/mm2 -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          NAME="kdf_$COMMIT_HASH-linux-x86-64.zip"
+          zip $NAME target/release/kdf -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
@@ -77,7 +83,7 @@ jobs:
 
       - name: Build and push container image
         run: |
-          export CONTAINER_TAG=$(./target/release/mm2 --version | awk '{print $3}')
+          export CONTAINER_TAG=$(./target/release/kdf --version | awk '{print $3}')
           docker build -t komodoofficial/komodo-defi-framework:"$CONTAINER_TAG" -t komodoofficial/komodo-defi-framework:main-latest -f .docker/Dockerfile.release .
           docker push komodoofficial/komodo-defi-framework:"$CONTAINER_TAG"
           docker push komodoofficial/komodo-defi-framework:main-latest
@@ -112,15 +118,21 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release --target x86_64-apple-darwin
+          cargo build --release --target x86_64-apple-darwin
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           NAME="mm2_$COMMIT_HASH-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/mm2 -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          NAME="kdf_$COMMIT_HASH-mac-x86-64.zip"
+          zip $NAME target/x86_64-apple-darwin/release/kdf -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
@@ -163,15 +175,21 @@ jobs:
             remove-item "./MM_VERSION"
           }
           echo $Env:COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --release
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           $NAME="mm2_$Env:COMMIT_HASH-win-x86-64.zip"
           7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
           mkdir $Env:BRANCH_NAME
           mv $NAME ./$Env:BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          $NAME="kdf_$Env:COMMIT_HASH-win-x86-64.zip"
+          7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
+          mv $NAME ./$Env:BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
@@ -214,14 +232,21 @@ jobs:
           echo $COMMIT_HASH > ./MM_VERSION
           cargo rustc --target x86_64-apple-darwin --lib --release --package mm2_bin_lib --crate-type=staticlib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           NAME="mm2_$COMMIT_HASH-mac-dylib-x86-64.zip"
-          mv target/x86_64-apple-darwin/release/libmm2lib.a target/x86_64-apple-darwin/release/libmm2.a
+          cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
           zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          NAME="kdf_$COMMIT_HASH-mac-dylib-x86-64.zip"
+          mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
+          zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
@@ -279,7 +304,7 @@ jobs:
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-wasm.zip"
+          NAME="kdf_$COMMIT_HASH-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
@@ -327,14 +352,21 @@ jobs:
           echo $COMMIT_HASH > ./MM_VERSION
           cargo rustc --target aarch64-apple-ios --lib --release --package mm2_bin_lib --crate-type=staticlib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           NAME="mm2_$COMMIT_HASH-ios-aarch64.zip"
-          mv target/aarch64-apple-ios/release/libmm2lib.a target/aarch64-apple-ios/release/libmm2.a
+          mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
           zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          NAME="kdf_$COMMIT_HASH-ios-aarch64.zip"
+          mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
+          zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
@@ -392,14 +424,21 @@ jobs:
           export PATH=$PATH:/android-ndk/bin
           CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --release --crate-type=staticlib --package mm2_bin_lib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           NAME="mm2_$COMMIT_HASH-android-aarch64.zip"
-          mv target/aarch64-linux-android/release/libmm2lib.a target/aarch64-linux-android/release/libmm2.a
-          zip $NAME target/aarch64-linux-android/release/libmm2.a  -j
+          mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
+          zip $NAME target/aarch64-linux-android/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          NAME="kdf_$COMMIT_HASH-android-aarch64.zip"
+          mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
+          zip $NAME target/aarch64-linux-android/release/libkdf.a  -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
@@ -457,14 +496,21 @@ jobs:
           export PATH=$PATH:/android-ndk/bin
           CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --release --crate-type=staticlib --package mm2_bin_lib
 
-      - name: Compress build output
+      - name: Compress mm2 build output
         run: |
           NAME="mm2_$COMMIT_HASH-android-armv7.zip"
-          mv target/armv7-linux-androideabi/release/libmm2lib.a target/armv7-linux-androideabi/release/libmm2.a
-          zip $NAME target/armv7-linux-androideabi/release/libmm2.a   -j
+          mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
+          zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
+      - name: Compress kdf build output
+        run: |
+          NAME="kdf_$COMMIT_HASH-android-armv7.zip"
+          mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
+          zip $NAME target/armv7-linux-androideabi/release/libkdf.a   -j
+          mv $NAME ./$BRANCH_NAME/
+
       - name: Upload output
         uses: garygrossgarten/github-action-scp@v0.8.0
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4303766a60..ba8a851544 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -96,7 +96,7 @@ jobs:
         run: |
           cargo test --bins --lib --no-fail-fast
 
-  linux-x86-64-mm2-integration:
+  linux-x86-64-kdf-integration:
     timeout-minutes: 90
     runs-on: ubuntu-latest
     env:
@@ -125,7 +125,7 @@ jobs:
           wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
           cargo test --test 'mm2_tests_main' --no-fail-fast
 
-  mac-x86-64-mm2-integration:
+  mac-x86-64-kdf-integration:
     timeout-minutes: 90
     runs-on: macos-latest
     env:
@@ -157,7 +157,7 @@ jobs:
           wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
           cargo test --test 'mm2_tests_main' --no-fail-fast
 
-  win-x86-64-mm2-integration:
+  win-x86-64-kdf-integration:
     timeout-minutes: 90
     runs-on: windows-latest
     env:
diff --git a/.github/workflows/validate-mm2-version.yml b/.github/workflows/validate-mm2-version.yml
index fd8c588c81..4abda09e96 100644
--- a/.github/workflows/validate-mm2-version.yml
+++ b/.github/workflows/validate-mm2-version.yml
@@ -1,4 +1,4 @@
-name: Validate mm2 version
+name: Validate kdf version
 
 on:
   pull_request:
diff --git a/.gitignore b/.gitignore
index 6eda35f707..e7735b0e63 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,9 @@ scripts/mm2/seed/unparsed.txt
 /js/mm2
 /js/mm2.exe
 /js/.mm2.*
+/js/kdf
+/js/kdf.exe
+/js/.kdf.*
 
 # Rust artefacts
 /MM_DATETIME
diff --git a/README.md b/README.md
index c301a29cba..ff05f9d501 100755
--- a/README.md
+++ b/README.md
@@ -89,13 +89,13 @@ If you want to build from source without installing prerequisites to your host s
 Build the image:
 
 ```sh
-docker build -t mm2-build-container -f .docker/Dockerfile .
+docker build -t kdf-build-container -f .docker/Dockerfile .
 ```
 
 Bind source code into container and compile it:
 
 ```sh
-docker run -v "$(pwd)":/app -w /app mm2-build-container cargo build
+docker run -v "$(pwd)":/app -w /app kdf-build-container cargo build
 ```
 
 Just like building it on your host system, you will now have the target directory containing the build files.
@@ -122,11 +122,11 @@ For example:
 
 The coins file contains information about the coins and tokens you want to trade. A regularly updated version is maintained in the [Komodo Platform coins repository](https://github.com/KomodoPlatform/coins/blob/master/coins). Pull Requests to add any coins not yet included are welcome.
 
-To facilitate interoperability with the `mm2` service, there is the `adex-cli` command line utility. It provides a questionnaire initialization mode to set up the configuration and obtain the proper coin set through the internet. It can also be used to start or stop the service.
+To facilitate interoperability with the `kdf` service, there is the `adex-cli` command line utility. It provides a questionnaire initialization mode to set up the configuration and obtain the proper coin set through the internet. It can also be used to start or stop the service.
 
 ## Usage
 
-To launch the Komodo DeFi Framework, run `./mm2` (or `mm2.exe` in Windows)
+To launch the Komodo DeFi Framework, run `./kdf` (or `kdf.exe` in Windows)
 
 To activate a coin:
 ```bash
@@ -185,7 +185,7 @@ Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic
 
 ## Disclaimer
 
-This repository contains the `work in progress` code of the brand new Komodo DeFi Framework (mm2) built mainly on Rust.  
+This repository contains the `work in progress` code of the brand new Komodo DeFi Framework (kdf) built mainly on Rust.  
 The current state can be considered as a alpha version.
 
 **<b>WARNING: Use with test coins only or with assets which value does not exceed an amount you are willing to lose. This is alpha stage software! </b>**
diff --git a/mm2src/mm2_bin_lib/Cargo.toml b/mm2src/mm2_bin_lib/Cargo.toml
index 2d1b1f461a..c06d9a7814 100644
--- a/mm2src/mm2_bin_lib/Cargo.toml
+++ b/mm2src/mm2_bin_lib/Cargo.toml
@@ -8,7 +8,7 @@ name = "mm2_bin_lib"
 version = "2.1.0-beta"
 authors = ["James Lee", "Artem Pikulin", "Artem Grinblat", "Omar S.", "Onur Ozkan", "Alina Sharon", "Caglar Kaya", "Cipi", "Sergey Boiko", "Samuel Onoja", "Roman Sztergbaum", "Kadan Stadelmann <ca333@komodoplatform.com>", "Dimxy"]
 edition = "2018"
-default-run = "mm2"
+default-run = "kdf"
 
 # wasm-opt reduces the size from 17 Mb to 14. But it runs for few minutes, which is not good for CI.
 # For production builds, it's recommended to run wasm-opt separately.
@@ -28,8 +28,15 @@ test = false
 doctest = false
 bench = false
 
+[[bin]]
+name = "kdf"
+path = "src/mm2_bin.rs"
+test = false
+doctest = false
+bench = false
+
 [lib]
-name = "mm2lib"
+name = "kdflib"
 crate-type = ["cdylib"]
 test = false
 doctest = false
diff --git a/mm2src/mm2_main/src/mm2.rs b/mm2src/mm2_main/src/mm2.rs
index 5bd85358cb..52412b6ec7 100644
--- a/mm2src/mm2_main/src/mm2.rs
+++ b/mm2src/mm2_main/src/mm2.rs
@@ -112,7 +112,7 @@ pub async fn lp_main(
 ) -> Result<(), String> {
     let log_filter = params.filter.unwrap_or_default();
     // Logger can be initialized once.
-    // If `mm2` is linked as a library, and `mm2` is restarted, `init_logger` returns an error.
+    // If `kdf` is linked as a library, and `kdf` is restarted, `init_logger` returns an error.
     init_logger(log_filter, params.conf["silent_console"].as_bool().unwrap_or_default()).ok();
 
     let conf = params.conf;
@@ -168,7 +168,7 @@ Some (but not all) of the JSON configuration parameters (* - required):
                      If the field isn't present on the command line then we try loading it from the 'coins' file.
   crash          ..  Simulate a crash to check how the crash handling works.
   dbdir          ..  MM database path. 'DB' by default.
-  gui            ..  The information about GUI app using MM2 instance. Included in swap statuses shared with network.
+  gui            ..  The information about GUI app using KDF instance. Included in swap statuses shared with network.
                  ..  It's recommended to put essential info to this field (application name, OS, version, etc).
                  ..  e.g. AtomicDEX iOS 1.0.1000.
   myipaddr       ..  IP address to bind to for P2P networking.
@@ -184,7 +184,7 @@ Some (but not all) of the JSON configuration parameters (* - required):
   rpc_local_only ..  MM forbids some RPC requests from not loopback (localhost) IPs as additional security measure.
                      Defaults to `true`, set `false` to disable. `Use with caution`.
   rpcport        ..  If > 1000 overrides the 7783 default.
-  i_am_seed      ..  Activate the seed node mode (acting as a relay for mm2 clients).
+  i_am_seed      ..  Activate the seed node mode (acting as a relay for kdf clients).
                      Defaults to `false`.
   seednodes      ..  Seednode IPs that node will use.
                      At least one seed IP must be present if the node is not a seed itself.
diff --git a/scripts/mm2/client/client b/scripts/mm2/client/client
index 42198d3b2c..046dfbecf1 100755
--- a/scripts/mm2/client/client
+++ b/scripts/mm2/client/client
@@ -12,4 +12,4 @@ echo "0.0.0.0 8923 $(ip route|awk '/default/ { print $3 }') 8923" >> /tmp/rinetd
 echo "0.0.0.0 11608 $(ip route|awk '/default/ { print $3 }') 11608" >> /tmp/rinetd.conf
 /usr/sbin/rinetd -c /tmp/rinetd.conf
 
-../../target/debug/mm2 "{\"netid\":9000,\"seednode\":\"$SEEDNODE\",\"gui\":\"nogui\",\"client\":1, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\"}"
+../../target/debug/kdf "{\"netid\":9000,\"seednode\":\"$SEEDNODE\",\"gui\":\"nogui\",\"client\":1, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\"}"
diff --git a/scripts/mm2/client/client_debug b/scripts/mm2/client/client_debug
index 1473588f41..ad7a686015 100755
--- a/scripts/mm2/client/client_debug
+++ b/scripts/mm2/client/client_debug
@@ -15,4 +15,4 @@ echo "0.0.0.0 8923 $(ip route|awk '/default/ { print $3 }') 8923" >> /tmp/rinetd
 echo "0.0.0.0 11608 $(ip route|awk '/default/ { print $3 }') 11608" >> /tmp/rinetd.conf
 /usr/sbin/rinetd -c /tmp/rinetd.conf
 
-gdbserver :4444 ../../target/debug/mm2 "{\"alice_contract\":\"0xe1d4236c5774d35dc47dcc2e5e0ccfc463a3289c\",\"bob_contract\":\"0x105aFE60fDC8B5c021092b09E8a042135A4A976E\",\"ethnode\":\"http://195.201.0.6:8545\",\"netid\":9999,\"seednode\":\"10.100.0.2\",\"gui\":\"nogui\",\"client\":1, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}"
+gdbserver :4444 ../../target/debug/kdf "{\"alice_contract\":\"0xe1d4236c5774d35dc47dcc2e5e0ccfc463a3289c\",\"bob_contract\":\"0x105aFE60fDC8B5c021092b09E8a042135A4A976E\",\"ethnode\":\"http://195.201.0.6:8545\",\"netid\":9999,\"seednode\":\"10.100.0.2\",\"gui\":\"nogui\",\"client\":1, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}"
diff --git a/scripts/mm2/seed/run b/scripts/mm2/seed/run
index ed5a091f9a..36ee73155c 100755
--- a/scripts/mm2/seed/run
+++ b/scripts/mm2/seed/run
@@ -12,4 +12,4 @@ echo "0.0.0.0 8923 $(ip route|awk '/default/ { print $3 }') 8923" >> /tmp/rinetd
 echo "0.0.0.0 11608 $(ip route|awk '/default/ { print $3 }') 11608" >> /tmp/rinetd.conf
 /usr/sbin/rinetd -c /tmp/rinetd.conf
 
-../../target/debug/mm2 "{\"netid\":9000,\"gui\":\"nogui\", \"profitmargin\":0.01, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}"
+../../target/debug/kdf "{\"netid\":9000,\"gui\":\"nogui\", \"profitmargin\":0.01, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}"
diff --git a/scripts/mm2/seed/run_debug b/scripts/mm2/seed/run_debug
index 03b269c1a1..23174d9048 100755
--- a/scripts/mm2/seed/run_debug
+++ b/scripts/mm2/seed/run_debug
@@ -15,4 +15,4 @@ echo "0.0.0.0 8923 $(ip route|awk '/default/ { print $3 }') 8923" >> /tmp/rinetd
 echo "0.0.0.0 11608 $(ip route|awk '/default/ { print $3 }') 11608" >> /tmp/rinetd.conf
 /usr/sbin/rinetd -c /tmp/rinetd.conf
 
-gdbserver :4444 ../../target/debug/mm2 "{\"alice_contract\":\"0xe1d4236c5774d35dc47dcc2e5e0ccfc463a3289c\",\"bob_contract\":\"0x105aFE60fDC8B5c021092b09E8a042135A4A976E\",\"ethnode\":\"http://195.201.0.6:8545\",\"netid\":9999,\"gui\":\"nogui\", \"profitmargin\":0.01, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}"
+gdbserver :4444 ../../target/debug/kdf "{\"alice_contract\":\"0xe1d4236c5774d35dc47dcc2e5e0ccfc463a3289c\",\"bob_contract\":\"0x105aFE60fDC8B5c021092b09E8a042135A4A976E\",\"ethnode\":\"http://195.201.0.6:8545\",\"netid\":9999,\"gui\":\"nogui\", \"profitmargin\":0.01, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}"