diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..67fa95b569
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behaviour** 
+What is the expected behaviour if the steps above are followed:
+
+**Current Behaviour**
+What is the current behaviour if the steps to reproduce are followed:
+
+**Describe the bug**
+
+**Screenshots or Logs**
+If applicable, add screenshots or logs to help explain your problem.
+
+**Additional Information (please complete the following information):**
+ - Operating System: [e.g. Ubuntu 16.04, Windows 10]
+-  Local or Remote node
+ - Version of Beldex daemon, or most recent commit hash.
diff --git a/Dockerfile b/Dockerfile
index 4329703a93..1b27d267c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -197,7 +197,7 @@ RUN set -ex && \
 COPY --from=builder /src/build/release/bin /usr/local/bin/
 
 # Contains the blockchain
-VOLUME /root/.loki
+VOLUME /root/.beldex
 
 # Generate your wallet via accessing the container and run:
 # cd /wallet
diff --git a/README.i18n.md b/README.i18n.md
index 2c84906820..15b47f34bb 100644
--- a/README.i18n.md
+++ b/README.i18n.md
@@ -1,9 +1,9 @@
 Beldex daemon internationalization
 ==================================
 
-The Beldex command line tools can be translated in various languages. If you wish to contribute and need help/support, contact the [Beldex Localization Workgroup on Taiga](https://taiga.getloki.org/project/erciccione-loki-localization/) or come chat on `#loki-translations` (Freenode/IRC, riot/matrix, MatterMost)
+The Beldex command line tools can be translated in various languages. If you wish to contribute and need help/support, contact the [Beldex Localization Workgroup on Taiga](https://taiga.getloki.org/project/erciccione-beldex-localization/) or come chat on `#beldex-translations` (Freenode/IRC, riot/matrix, MatterMost)
 
-In order to use the same translation workflow as the [Beldex GUI](https://github.com/Beldex-Coin/loki-gui), they use Qt Linguist translation files.  However, to avoid the dependencies on Qt this normally implies, they use a custom loader to read those files at runtime.
+In order to use the same translation workflow as the [Beldex GUI](https://github.com/Beldex-Coin/beldex-gui), they use Qt Linguist translation files.  However, to avoid the dependencies on Qt this normally implies, they use a custom loader to read those files at runtime.
 
 ### Tools for translators
 
@@ -19,7 +19,7 @@ To update ts files after changing source code:
 
 To add a new language, eg Spanish (ISO code es):
 
-    cp translations/loki.ts translations/beldex_es.ts
+    cp translations/beldex.ts translations/beldex_es.ts
 
 To edit translations for Spanish:
 
@@ -31,7 +31,7 @@ To build translations after modifying them:
 
 To test a translation:
 
-    LANG=es ./build/release/bin/loki-wallet-cli
+    LANG=es ./build/release/bin/beldex-wallet-cli
 
 To add new translatable strings in the source code:
 
diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md
index 8146e3d435..510c3037bd 100644
--- a/contrib/gitian/README.md
+++ b/contrib/gitian/README.md
@@ -83,7 +83,7 @@ Setup the required environment, you only need to do this once:
 ./gitian-build.py --setup beldex-user x.x.x
 ```
 
-Where `loki-user` is your Github name and `x.x.x` is the version tag you want to build.
+Where `beldex-user` is your Github name and `x.x.x` is the version tag you want to build.
 
 While gitian and this build script does provide a way for you to sign the build directly, it is recommended to sign in a seperate step. 
 This script is only there for convenience. Seperate steps for building can still be taken.
@@ -93,7 +93,7 @@ or pass the signed assert file back to your build machine.
 
 ```
 git clone git@github.com:Beldex-Coin/gitian.sigs.git
-git remote add beldex-user git@github.com:loki-user/gitian.sigs.git
+git remote add beldex-user git@github.com:beldex-user/gitian.sigs.git
 ```
 
 Build Binaries
@@ -109,11 +109,11 @@ If all went well, this produces a number of (uncommited) `.assert` files in the
 If you do detached, offline signing, you need to copy these uncommited changes to your host machine, where you can sign them. For example:
 
 ```
-export NAME=loki-user
+export NAME=beldex-user
 export VERSION=2.0.0
-gpg --output $VERSION-linux/$NAME/loki-linux-$VERSION-build.assert.sig --detach-sign $VERSION-linux/$NAME/loki-linux-$VERSION-build.assert
-gpg --output $VERSION-osx-unsigned/$NAME/loki-osx-$VERSION-build.assert.sig --detach-sign $VERSION-osx-unsigned/$NAME/loki-osx-$VERSION-build.assert
-gpg --output $VERSION-win-unsigned/$NAME/loki-win-$VERSION-build.assert.sig --detach-sign $VERSION-win-unsigned/$NAME/loki-win-$VERSION-build.assert
+gpg --output $VERSION-linux/$NAME/beldex-linux-$VERSION-build.assert.sig --detach-sign $VERSION-linux/$NAME/beldex-linux-$VERSION-build.assert
+gpg --output $VERSION-osx-unsigned/$NAME/beldex-osx-$VERSION-build.assert.sig --detach-sign $VERSION-osx-unsigned/$NAME/beldex-osx-$VERSION-build.assert
+gpg --output $VERSION-win-unsigned/$NAME/beldex-win-$VERSION-build.assert.sig --detach-sign $VERSION-win-unsigned/$NAME/beldex-win-$VERSION-build.assert
 ```
 
 Make a pull request (both the `.assert` and `.assert.sig` files) to the
@@ -126,8 +126,8 @@ git push --set-upstream $NAME 2.0.0
 ```
 
 ```bash
-    gpg --detach-sign ${VERSION}-linux/${SIGNER}/loki-linux-*-build.assert
-    gpg --detach-sign ${VERSION}-win-unsigned/${SIGNER}/loki-win-*-build.assert
-    gpg --detach-sign ${VERSION}-osx-unsigned/${SIGNER}/loki-osx-*-build.assert
+    gpg --detach-sign ${VERSION}-linux/${SIGNER}/beldex-linux-*-build.assert
+    gpg --detach-sign ${VERSION}-win-unsigned/${SIGNER}/beldex-win-*-build.assert
+    gpg --detach-sign ${VERSION}-osx-unsigned/${SIGNER}/beldex-osx-*-build.assert
 ```
 
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 4e89cf2dfc..783f10cbd1 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -26,8 +26,8 @@ def setup():
         subprocess.check_call(['git', 'clone', 'https://github.com/Beldex-Coin/gitian.sigs.git'])
     if not os.path.isdir('gitian-builder'):
         subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
-    if not os.path.isdir('loki'):
-        subprocess.check_call(['git', 'clone', 'https://github.com/Beldex-Coin/loki.git'])
+    if not os.path.isdir('beldex'):
+        subprocess.check_call(['git', 'clone', 'https://github.com/Beldex-Coin/beldex.git'])
     os.chdir('gitian-builder')
     subprocess.check_call(['git', 'checkout', '963322de8420c50502c4cc33d4d7c0d84437b576'])
     make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
@@ -45,7 +45,7 @@ def setup():
 def build():
     global args, workdir
 
-    os.makedirs('loki-binaries/' + args.version, exist_ok=True)
+    os.makedirs('beldex-binaries/' + args.version, exist_ok=True)
     print('\nBuilding Dependencies\n')
     os.chdir('gitian-builder')
     os.makedirs('inputs', exist_ok=True)
@@ -54,25 +54,25 @@ def build():
     subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
     subprocess.check_output(["echo 'a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 inputs/osslsigncode-Backports-to-1.7.1.patch' | sha256sum -c"], shell=True)
     subprocess.check_output(["echo 'f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9 inputs/osslsigncode-1.7.1.tar.gz' | sha256sum -c"], shell=True)
-    subprocess.check_call(['make', '-C', '../loki/contrib/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
+    subprocess.check_call(['make', '-C', '../beldex/contrib/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
 
     if args.linux:
         print('\nCompiling ' + args.version + ' Linux')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'loki='+args.commit, '--url', 'loki='+args.url, '../loki/contrib/gitian/gitian-linux.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../loki/contrib/gitian/gitian-linux.yml'])
-        subprocess.check_call('mv build/out/loki-*.tar.gz ../loki-binaries/'+args.version, shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'beldex='+args.commit, '--url', 'beldex='+args.url, '../beldex/contrib/gitian/gitian-linux.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../beldex/contrib/gitian/gitian-linux.yml'])
+        subprocess.check_call('mv build/out/beldex-*.tar.gz ../beldex-binaries/'+args.version, shell=True)
 
     if args.windows:
         print('\nCompiling ' + args.version + ' Windows')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'loki='+args.commit, '--url', 'loki='+args.url, '../loki/contrib/gitian/gitian-win.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win', '--destination', '../gitian.sigs/', '../loki/contrib/gitian/gitian-win.yml'])
-        subprocess.check_call('mv build/out/loki*.zip ../loki-binaries/'+args.version, shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'beldex='+args.commit, '--url', 'beldex='+args.url, '../beldex/contrib/gitian/gitian-win.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win', '--destination', '../gitian.sigs/', '../beldex/contrib/gitian/gitian-win.yml'])
+        subprocess.check_call('mv build/out/beldex*.zip ../beldex-binaries/'+args.version, shell=True)
 
     if args.macos:
         print('\nCompiling ' + args.version + ' MacOS')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'loki='+args.commit, '--url', 'loki'+args.url, '../loki/contrib/gitian/gitian-osx.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx', '--destination', '../gitian.sigs/', '../loki/contrib/gitian/gitian-osx.yml'])
-        subprocess.check_call('mv build/out/loki*.tar.gz ../loki-binaries/'+args.version, shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'beldex='+args.commit, '--url', 'beldex'+args.url, '../beldex/contrib/gitian/gitian-osx.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx', '--destination', '../gitian.sigs/', '../beldex/contrib/gitian/gitian-osx.yml'])
+        subprocess.check_call('mv build/out/beldex*.tar.gz ../beldex-binaries/'+args.version, shell=True)
 
     os.chdir(workdir)
 
@@ -90,11 +90,11 @@ def verify():
     os.chdir('gitian-builder')
 
     print('\nVerifying v'+args.version+' Linux\n')
-    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../loki/contrib/gitian/gitian-linux.yml'])
+    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../beldex/contrib/gitian/gitian-linux.yml'])
     print('\nVerifying v'+args.version+' Windows\n')
-    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win', '../loki/contrib/gitian/gitian-win.yml'])
+    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win', '../beldex/contrib/gitian/gitian-win.yml'])
     print('\nVerifying v'+args.version+' MacOS\n')
-    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx', '../loki/contrib/gitian/gitian-osx.yml'])
+    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx', '../beldex/contrib/gitian/gitian-osx.yml'])
     os.chdir(workdir)
 
 def main():
@@ -103,7 +103,7 @@ def main():
     parser = argparse.ArgumentParser(usage='%(prog)s [options] signer version')
     parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
     parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
-    parser.add_argument('-u', '--url', dest='url', default='https://github.com/Beldex-Coin/loki', help='Specify the URL of the repository. Default is %(default)s')
+    parser.add_argument('-u', '--url', dest='url', default='https://github.com/Beldex-Coin/beldex', help='Specify the URL of the repository. Default is %(default)s')
     parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
     parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
     parser.add_argument('-B', '--buildsign', action='store_true', dest='buildsign', help='Build both signed and unsigned binaries')
@@ -170,10 +170,10 @@ def main():
     if args.setup:
         setup()
 
-    os.chdir('loki')
+    os.chdir('beldex')
     if args.pull:
         subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
-        os.chdir('../gitian-builder/inputs/loki')
+        os.chdir('../gitian-builder/inputs/beldex')
         subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
         args.commit = subprocess.check_output(['git', 'show', '-s', '--format=%H', 'FETCH_HEAD'], universal_newlines=True).strip()
         args.version = 'pull-' + args.version
diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml
index 8e1a9348bb..d6de4e7c73 100644
--- a/contrib/gitian/gitian-linux.yml
+++ b/contrib/gitian/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "loki-linux-x64-1.0.4"
+name: "beldex-linux-x64-1.0.4"
 enable_cache: true
 suites:
 - "bionic"
@@ -43,7 +43,7 @@ packages:
 - "libprotobuf-dev"
 - "python3-zmq"
 remotes:
-- "url": "https://github.com/Beldex-Coin/loki.git"
+- "url": "https://github.com/Beldex-Coin/beldex.git"
   "dir": "beldex"
 files: []
 script: |
@@ -154,7 +154,7 @@ script: |
     mkdir build && cd build
     cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON
     make
-    DISTNAME=loki-${i}
+    DISTNAME=beldex-${i}
     mv bin ${DISTNAME}
     find ${DISTNAME}/ | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}.tar.gz
     cd ..
diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml
index 649860dcba..e115f51991 100644
--- a/contrib/gitian/gitian-osx.yml
+++ b/contrib/gitian/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "loki-osx-x64-1.0.4"
+name: "beldex-osx-x64-1.0.4"
 enable_cache: true
 suites:
 - "bionic"
@@ -28,7 +28,7 @@ packages:
 - "python-setuptools"
 - "fonts-tuffy"
 remotes:
-- "url": "https://github.com/Beldex-Coin/loki.git"
+- "url": "https://github.com/Beldex-Coin/beldex.git"
   "dir": "beldex"
 files:
 - "MacOSX10.11.sdk.tar.gz"
@@ -105,7 +105,7 @@ script: |
     mkdir build && cd build
     cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
     make
-    DISTNAME=loki-${i}
+    DISTNAME=beldex-${i}
     mv bin ${DISTNAME}
     find ${DISTNAME}/ | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}.tar.gz
     cd ..
diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml
index 8b81fa70e5..e61b3d88b2 100644
--- a/contrib/gitian/gitian-win.yml
+++ b/contrib/gitian/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "loki-windows-x64-1.0.4"
+name: "beldex-windows-x64-1.0.4"
 enable_cache: true
 suites:
 - "bionic"
@@ -23,7 +23,7 @@ packages:
 - "rename"
 - "cmake"
 remotes:
-- "url": "https://github.com/Beldex-Coin/loki.git"
+- "url": "https://github.com/Beldex-Coin/beldex.git"
   "dir": "beldex"
 files: []
 script: |
@@ -126,7 +126,7 @@ script: |
     mkdir build && cd build
     cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
     make
-    DISTNAME=loki-${i}
+    DISTNAME=beldex-${i}
     mv bin ${DISTNAME}
     find ${DISTNAME}/ | sort | zip -X@ ${OUTDIR}/${DISTNAME}.zip
     cd .. && rm -rf build
diff --git a/src/blockchain_utilities/README.md b/src/blockchain_utilities/README.md
index fd782635dd..4535bdba7f 100644
--- a/src/blockchain_utilities/README.md
+++ b/src/blockchain_utilities/README.md
@@ -22,7 +22,7 @@ This loads the existing blockchain and exports it to `$BELDEX_DATA_DIR/export/bl
 `$ beldex-blockchain-import`
 
 This imports blocks from `$BELDEX_DATA_DIR/export/blockchain.raw` (exported using the
-`loki-blockchain-export` tool as described above) into the current database.
+`beldex-blockchain-export` tool as described above) into the current database.
 
 Defaults: `--batch on`, `--batch size 20000`, `--verify on`
 
@@ -31,7 +31,7 @@ Batch size refers to number of blocks and can be adjusted for performance based
 Verification should only be turned off if importing from a trusted blockchain.
 
 If you encounter an error like "resizing not supported in batch mode", you can just re-run
-the `loki-blockchain-import` command again, and it will restart from where it left off.
+the `beldex-blockchain-import` command again, and it will restart from where it left off.
 
 ```bash
 ## use default settings to import blockchain.raw into database
diff --git a/src/blockchain_utilities/blockchain_ancestry.cpp b/src/blockchain_utilities/blockchain_ancestry.cpp
index 000faad742..f950d11907 100644
--- a/src/blockchain_utilities/blockchain_ancestry.cpp
+++ b/src/blockchain_utilities/blockchain_ancestry.cpp
@@ -404,7 +404,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-ancestry.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-ancestry.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_blackball.cpp b/src/blockchain_utilities/blockchain_blackball.cpp
index 8982256020..6a85014556 100644
--- a/src/blockchain_utilities/blockchain_blackball.cpp
+++ b/src/blockchain_utilities/blockchain_blackball.cpp
@@ -139,7 +139,7 @@ static bool parse_db_sync_mode(std::string db_sync_mode)
 static std::string get_default_db_path()
 {
   boost::filesystem::path dir = tools::get_default_data_dir();
-  // remove .loki, replace with .shared-ringdb
+  // remove .beldex, replace with .shared-ringdb
   dir = dir.remove_filename();
   dir /= ".shared-ringdb";
   return dir.string();
@@ -1135,7 +1135,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-mark-spent-outputs.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-mark-spent-outputs.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_depth.cpp b/src/blockchain_utilities/blockchain_depth.cpp
index de347e3b4d..f256222b26 100644
--- a/src/blockchain_utilities/blockchain_depth.cpp
+++ b/src/blockchain_utilities/blockchain_depth.cpp
@@ -101,7 +101,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-depth.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-depth.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_export.cpp b/src/blockchain_utilities/blockchain_export.cpp
index ffc2957d4e..84d501e83e 100644
--- a/src/blockchain_utilities/blockchain_export.cpp
+++ b/src/blockchain_utilities/blockchain_export.cpp
@@ -102,7 +102,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-export.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-export.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp
index 9950f70f75..f24bb4307c 100644
--- a/src/blockchain_utilities/blockchain_import.cpp
+++ b/src/blockchain_utilities/blockchain_import.cpp
@@ -683,7 +683,7 @@ int main(int argc, char* argv[])
   m_config_folder = command_line::get_arg(vm, cryptonote::arg_data_dir);
   db_arg_str = command_line::get_arg(vm, arg_database);
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-import.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-import.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_prune.cpp b/src/blockchain_utilities/blockchain_prune.cpp
index 4a085c5d95..14d7cf1b63 100644
--- a/src/blockchain_utilities/blockchain_prune.cpp
+++ b/src/blockchain_utilities/blockchain_prune.cpp
@@ -496,7 +496,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-prune.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-prune.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp b/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp
index 41219a7f5c..ac93681af2 100644
--- a/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp
+++ b/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp
@@ -155,7 +155,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-prune-known-spent-data.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-prune-known-spent-data.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_stats.cpp b/src/blockchain_utilities/blockchain_stats.cpp
index a8e47d193b..f99b549b79 100644
--- a/src/blockchain_utilities/blockchain_stats.cpp
+++ b/src/blockchain_utilities/blockchain_stats.cpp
@@ -111,7 +111,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-stats.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-stats.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/blockchain_utilities/blockchain_usage.cpp b/src/blockchain_utilities/blockchain_usage.cpp
index 98e187ac18..c89373ec2d 100644
--- a/src/blockchain_utilities/blockchain_usage.cpp
+++ b/src/blockchain_utilities/blockchain_usage.cpp
@@ -134,7 +134,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-usage.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-usage.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index 54b3b903c2..5b6185d1b2 100644
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -39,7 +39,7 @@
 
 using namespace epee;
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 #undef BELDEX_DEFAULT_LOG_CATEGORY
 #define BELDEX_DEFAULT_LOG_CATEGORY "checkpoints"
@@ -174,7 +174,7 @@ namespace cryptonote
       case MAINNET:
 #if !defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
         ADD_CHECKPOINT(1,     "a9eedcc8ad75c40acbed366a64029d0bf1c1b282ec0ca1d28213b9d386c2b81f");
-	    ADD_CHECKPOINT(10,    "a4014ffa8d32fe14bba3c6d8fc2bf8d3766615ee9ba779a075219a067257216c");
+	      ADD_CHECKPOINT(10,    "a4014ffa8d32fe14bba3c6d8fc2bf8d3766615ee9ba779a075219a067257216c");
         ADD_CHECKPOINT(100,   "450a6fdade242c8afa8db3414a45a94371bf320470f95408a12122a64b836ee1");
         ADD_CHECKPOINT(1000,  "c023df332f7f6f7fcc8e2d1e5f57791a3a8e0b4c18eabb5b4362cdfea559c4a3");
         ADD_CHECKPOINT(10000, "2ba23579a88eb51c3b6f942f7a9d4551949dc9c0f28bb9828a1b31b86be7530e");
@@ -182,6 +182,8 @@ namespace cryptonote
         ADD_CHECKPOINT(30000, "3564a8f37148b5e9639f6cf2bb8c67d0176a5464001449d5e8420fc0d67fa587");
         ADD_CHECKPOINT(40000, "ac2ad416b209526eb1c6f8e17d678896284561e55422541c82605dcea023e73c");
         ADD_CHECKPOINT(43108, "f54611306472cae55e4de18544f1c00bd83902a86d35310ac7e2cad846457a50");
+        ADD_CHECKPOINT(50000, "64f0bc96738d3d809baef37991d85c497ad4b52d224757fd71a42aab3ded49b6");
+        ADD_CHECKPOINT(55000, "f00d1ab250da7935ef74bf907d94d1ac1f91be93fd3f0506fc9cf150c75c32e9");
 #endif
         break;
     }
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 7b07b36df2..cc5ed48cce 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -36,7 +36,7 @@ set(common_sources
   download.cpp
   error.cpp
   expect.cpp
-  loki.cpp
+  beldex.cpp
   util.cpp
   i18n.cpp
   rules.cpp
@@ -71,9 +71,9 @@ set(common_private_headers
   download.h
   error.h
   expect.h
-  loki.h
+  beldex.h
   http_connection.h
-  loki_integration_test_hooks.h
+  beldex_integration_test_hooks.h
   notify.h
   pod-class.h
   pruning.h
diff --git a/src/common/loki.cpp b/src/common/beldex.cpp
similarity index 98%
rename from src/common/loki.cpp
rename to src/common/beldex.cpp
index e5a4cde70d..add23ce500 100644
--- a/src/common/loki.cpp
+++ b/src/common/beldex.cpp
@@ -1,4 +1,4 @@
-#include "loki.h"
+#include "beldex.h"
 #include <assert.h>
 
 /* Exponential base 2 function.
@@ -44,7 +44,7 @@ static_assert(std::numeric_limits<double>::is_iec559, "We require IEEE standard
 #define LOG2_BY_256_INVERSE 369.329930467574632284140718336484387181
 
 double
-loki::exp2(double x)
+beldex::exp2(double x)
 {
   /* exp2(x) = exp(x*log(2)).
      If we would compute it like this, there would be rounding errors for
@@ -98,7 +98,7 @@ loki::exp2(double x)
        truncate the series after the z^5 term.  */
 
   {
-    double nm = loki::round (x * 256.0); /* = 256 * n + m */
+    double nm = beldex::round (x * 256.0); /* = 256 * n + m */
     double z = (x * 256.0 - nm) * (LOG2_BY_256 * 0.5);
 
 /* Coefficients of the power series for tanh(z).  */
@@ -120,7 +120,7 @@ loki::exp2(double x)
 
     double exp_y = (1.0 + tanh_z) / (1.0 - tanh_z);
 
-    int n = (int) loki::round (nm * (1.0 / 256.0));
+    int n = (int) beldex::round (nm * (1.0 / 256.0));
     int m = (int) nm - 256 * n;
 
     /* exp_table[i] = exp((i - 128) * log(2)/256).
@@ -438,7 +438,7 @@ loki::exp2(double x)
 #endif
 
 double
-loki::round (double x)
+beldex::round (double x)
 {
   /* 2^(DBL_MANT_DIG-1).  */
   static const double TWO_MANT_DIG =
@@ -556,7 +556,7 @@ constexpr uint8_t hexpair_to_byte(const char & hi, const char & lo)
   return hex_to_nibble(hi) << 4 | hex_to_nibble(lo);
 }
 
-std::string loki::hex64_to_base32z(const std::string &src)
+std::string beldex::hex64_to_base32z(const std::string &src)
 {
   assert(src.size() <= 64); // NOTE: Developer error, update function if you need more. This is intended for 64 char snode pubkeys
   // decode to binary
diff --git a/src/common/loki.h b/src/common/beldex.h
similarity index 99%
rename from src/common/loki.h
rename to src/common/beldex.h
index 783281738c..460afef537 100644
--- a/src/common/loki.h
+++ b/src/common/beldex.h
@@ -31,7 +31,7 @@
 
 #include <string>
 
-namespace loki
+namespace beldex
 {
 double      round           (double);
 double      exp2            (double);
diff --git a/src/common/loki_integration_test_hooks.h b/src/common/beldex_integration_test_hooks.h
similarity index 92%
rename from src/common/loki_integration_test_hooks.h
rename to src/common/beldex_integration_test_hooks.h
index ab565c7e80..da3809a792 100644
--- a/src/common/loki_integration_test_hooks.h
+++ b/src/common/beldex_integration_test_hooks.h
@@ -83,7 +83,7 @@ const command_line::arg_descriptor<std::string, false> arg_integration_test_hard
 const command_line::arg_descriptor<std::string, false> arg_integration_test_shared_mem_name = {
   "integration-test-shared-mem-name"
 , "Specify the shared memory base name for stdin, stdout and semaphore name"
-, "loki-default-integration-test-mem-name"
+, "beldex-default-integration-test-mem-name"
 , false
 };
 
@@ -96,10 +96,10 @@ std::string global_stdout_semaphore_name;
 std::string global_stdout_ready_semaphore_name;
 std::string global_stdin_ready_semaphore_name;
 
-void loki::use_standard_cout()   { if (!global_std_cout) { global_std_cout = std::cout.rdbuf(); } std::cout.rdbuf(global_std_cout); }
-void loki::use_redirected_cout() { if (!global_std_cout) { global_std_cout = std::cout.rdbuf(); } std::cout.rdbuf(global_redirected_cout.rdbuf()); }
+void beldex::use_standard_cout()   { if (!global_std_cout) { global_std_cout = std::cout.rdbuf(); } std::cout.rdbuf(global_std_cout); }
+void beldex::use_redirected_cout() { if (!global_std_cout) { global_std_cout = std::cout.rdbuf(); } std::cout.rdbuf(global_redirected_cout.rdbuf()); }
 
-void loki::init_integration_test_context(const std::string &base_name)
+void beldex::init_integration_test_context(const std::string &base_name)
 {
   assert(base_name.size() > 0);
 
@@ -153,7 +153,7 @@ void loki::init_integration_test_context(const std::string &base_name)
       global_stdout_ready_semaphore_name.c_str());
 }
 
-void loki::deinit_integration_test_context()
+void beldex::deinit_integration_test_context()
 {
   sem_unlink(global_stdin_semaphore_name.c_str());
   sem_unlink(global_stdout_semaphore_name.c_str());
@@ -204,7 +204,7 @@ static char *parse_message(char *msg_buf, int msg_buf_len)
   return ptr;
 }
 
-std::vector<std::string> loki::separate_stdin_to_space_delim_args(loki::fixed_buffer const *cmd)
+std::vector<std::string> beldex::separate_stdin_to_space_delim_args(beldex::fixed_buffer const *cmd)
 {
   std::vector<std::string> args;
   char const *start = cmd->data;
@@ -227,7 +227,7 @@ std::vector<std::string> loki::separate_stdin_to_space_delim_args(loki::fixed_bu
   return args;
 }
 
-loki::fixed_buffer loki::read_from_stdin_shared_mem()
+beldex::fixed_buffer beldex::read_from_stdin_shared_mem()
 {
   boost::unique_lock<boost::mutex> scoped_lock(integration_test_mutex);
 
@@ -261,7 +261,7 @@ loki::fixed_buffer loki::read_from_stdin_shared_mem()
   return result;
 }
 
-void loki::write_redirected_stdout_to_shared_mem()
+void beldex::write_redirected_stdout_to_shared_mem()
 {
   boost::unique_lock<boost::mutex> scoped_lock(integration_test_mutex);
 
diff --git a/src/common/password.cpp b/src/common/password.cpp
index 3403606cb1..f866571e33 100644
--- a/src/common/password.cpp
+++ b/src/common/password.cpp
@@ -43,7 +43,7 @@
 
 #define EOT 0x4
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 namespace
 {
diff --git a/src/common/scoped_message_writer.cpp b/src/common/scoped_message_writer.cpp
index fa1b7da747..91edd5e031 100644
--- a/src/common/scoped_message_writer.cpp
+++ b/src/common/scoped_message_writer.cpp
@@ -1,12 +1,12 @@
 #include "scoped_message_writer.h"
 
 #define BELDEX_INTEGRATION_TEST_HOOKS_IMPLEMENTATION
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 // NOTE(beldex): This file only exists because I need a way to hook into the
 // message writer for integration tests. Originally this was a header only file,
 // which means it needs to know the implementation of
-// loki_integration_test_hooks.h functions which isn't possible to expose in
+// beldex_integration_test_hooks.h functions which isn't possible to expose in
 // just the header because of the One Definition Rule.
 //   - doyle 2018-11-08
 
@@ -18,7 +18,7 @@ tools::scoped_message_writer::~scoped_message_writer()
 
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
     std::cout << m_oss.str();
-    loki::write_redirected_stdout_to_shared_mem();
+    beldex::write_redirected_stdout_to_shared_mem();
     return;
 #endif
 
diff --git a/src/common/scoped_message_writer.h b/src/common/scoped_message_writer.h
index aeab622e80..5a375b1f6a 100644
--- a/src/common/scoped_message_writer.h
+++ b/src/common/scoped_message_writer.h
@@ -39,7 +39,7 @@
   #define PAUSE_READLINE()
 #endif
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 namespace tools
 {
diff --git a/src/cryptonote_basic/cryptonote_basic_impl.cpp b/src/cryptonote_basic/cryptonote_basic_impl.cpp
index c44c0acfb5..aa43f42d80 100644
--- a/src/cryptonote_basic/cryptonote_basic_impl.cpp
+++ b/src/cryptonote_basic/cryptonote_basic_impl.cpp
@@ -43,7 +43,7 @@ using namespace epee;
 #include "crypto/hash.h"
 #include "int-util.h"
 #include "common/dns_utils.h"
-#include "common/loki.h"
+#include "common/beldex.h"
 
 #undef BELDEX_DEFAULT_LOG_CATEGORY
 #define BELDEX_DEFAULT_LOG_CATEGORY "cn"
diff --git a/src/cryptonote_basic/difficulty.cpp b/src/cryptonote_basic/difficulty.cpp
index 3532c72f89..b75e6eaf35 100644
--- a/src/cryptonote_basic/difficulty.cpp
+++ b/src/cryptonote_basic/difficulty.cpp
@@ -35,7 +35,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "common/loki.h"
+#include "common/beldex.h"
 #include "include_base_utils.h"
 #include "int-util.h"
 #include "crypto/hash.h"
@@ -194,7 +194,7 @@ namespace cryptonote {
     harmonic_mean_D = N / sum_inverse_D;
 
     // Keep LWMA sane in case something unforeseen occurs.
-    if (static_cast<int64_t>(loki::round(LWMA)) < T / 20)
+    if (static_cast<int64_t>(beldex::round(LWMA)) < T / 20)
       LWMA = static_cast<double>(T / 20);
 
     nextDifficulty = harmonic_mean_D * T / LWMA * adjust;
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index 4215c13788..ace58aa889 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -47,7 +47,7 @@
 #define CURRENT_BLOCK_MINOR_VERSION                     8
 #define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT_V2           60*10
 #define CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE             10
-#define CRYPTONOTE_DEFAULT_TX_MIXIN                     7
+#define CRYPTONOTE_DEFAULT_TX_MIXIN                     9
 
 #define STAKING_REQUIREMENT_LOCK_BLOCKS_EXCESS          20
 #define STAKING_PORTIONS                                UINT64_C(0xfffffffffffffffc)
@@ -89,11 +89,11 @@ static_assert(STAKING_PORTIONS % 3 == 0, "Use a multiple of three, so that it di
 
 #define FEE_PER_KB_OLD                                  ((uint64_t)100000000) // pow(10, 8)
 #define FEE_PER_KB                                      ((uint64_t)2000000) // 2 * pow(10, 6)
-#define FEE_PER_BYTE                                    ((uint64_t)300)
+#define FEE_PER_BYTE                                    ((uint64_t)30000000)
 #define DYNAMIC_FEE_PER_KB_BASE_FEE                     ((uint64_t)2000000) // 2 * pow(10,6)
 #define DYNAMIC_FEE_PER_KB_BASE_BLOCK_REWARD            ((uint64_t)10000000000) // 10 * pow(10,9)
 #define DYNAMIC_FEE_PER_KB_BASE_FEE_V5                  ((uint64_t)20000000 * (uint64_t)CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2 / CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5)
-#define DYNAMIC_FEE_REFERENCE_TRANSACTION_WEIGHT        ((uint64_t)3)
+#define DYNAMIC_FEE_REFERENCE_TRANSACTION_WEIGHT        ((uint64_t)300000)
 
 #define ORPHANED_BLOCKS_MAX_COUNT                       100
 
@@ -164,7 +164,7 @@ static_assert(STAKING_PORTIONS % 3 == 0, "Use a multiple of three, so that it di
 #define HF_VERSION_DYNAMIC_FEE                  4
 #define HF_VERSION_MIN_MIXIN_9                  7
 #define HF_VERSION_ENFORCE_RCT                  6
-#define HF_VERSION_PER_BYTE_FEE                 cryptonote::network_version_10_bulletproofs
+#define HF_VERSION_PER_BYTE_FEE                 cryptonote::network_version_11_infinite_staking
 #define HF_VERSION_SMALLER_BP                   cryptonote::network_version_11_infinite_staking
 #define HF_VERSION_LONG_TERM_BLOCK_WEIGHT       cryptonote::network_version_11_infinite_staking
 
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index ff05f85735..7d0513fba5 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -100,15 +100,17 @@ static const hard_fork_record mainnet_hard_forks[] =
 {
 	{ 1, 1, 0, 1548750273 },
 	{ network_version_7, 10, 0, 1548750283 },
-	{ network_version_8, 40000, 0, 1559474448 } 
+	{ network_version_8, 40000, 0, 1559474448 },
+	{ network_version_11_infinite_staking, 56240, 0, 1577836800 } 
 };
 static const uint64_t mainnet_hard_fork_version_1_till = 9;
 
 static const hard_fork_record testnet_hard_forks[] =
 {
   { 1, 1, 0, 1554197086},
-  { network_version_7, 10, 0, 1559474448 },
-  { network_version_8, 11, 0, 1559474449 } 
+  { network_version_7, 10, 0, 1548474448 },
+  { network_version_8, 11, 0, 1548474449 },
+  { network_version_11_infinite_staking, 12, 0, 1559474450 } 
 };
 static const uint64_t testnet_hard_fork_version_1_till = 9;
 
@@ -2713,6 +2715,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
 
         // Mixin Check, from hard fork 7, we require mixin at least 9, always.
         if (((hf_version <=7) && (in_to_key.key_offsets.size() - 1 < 6) && tx.version==2) ||
+		    ((hf_version ==8) && (in_to_key.key_offsets.size() - 1 < 7) ) ||
             ((hf_version >8 ) && (in_to_key.key_offsets.size() - 1 != CRYPTONOTE_DEFAULT_TX_MIXIN)))
         {
           MERROR_VER("Tx " << get_transaction_hash(tx) << " has incorrect ring size (" << in_to_key.key_offsets.size() - 1 << ", expected (" << CRYPTONOTE_DEFAULT_TX_MIXIN << ")");
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 00bedac9e2..54747a9bea 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -58,7 +58,7 @@ using namespace epee;
 #include "wipeable_string.h"
 #include "common/i18n.h"
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 #undef BELDEX_DEFAULT_LOG_CATEGORY
 #define BELDEX_DEFAULT_LOG_CATEGORY "cn"
@@ -337,8 +337,8 @@ namespace cryptonote
     command_line::add_arg(desc, arg_block_rate_notify);
 
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
-    command_line::add_arg(desc, loki::arg_integration_test_hardforks_override);
-    command_line::add_arg(desc, loki::arg_integration_test_shared_mem_name);
+    command_line::add_arg(desc, beldex::arg_integration_test_hardforks_override);
+    command_line::add_arg(desc, beldex::arg_integration_test_shared_mem_name);
 #endif
 
     miner::init_options(desc);
@@ -460,7 +460,7 @@ namespace cryptonote
     start_time = std::time(nullptr);
 
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
-    const std::string arg_integration_test_override_hardforks = command_line::get_arg(vm, loki::arg_integration_test_hardforks_override);
+    const std::string arg_integration_test_override_hardforks = command_line::get_arg(vm, beldex::arg_integration_test_hardforks_override);
 
     std::vector<std::pair<uint8_t, uint64_t>> integration_test_hardforks;
     if (!arg_integration_test_override_hardforks.empty())
@@ -488,8 +488,8 @@ namespace cryptonote
       test_options = &integration_hardfork_override;
 
     {
-      const std::string arg_shared_mem_name = command_line::get_arg(vm, loki::arg_integration_test_shared_mem_name);
-      loki::init_integration_test_context(arg_shared_mem_name);
+      const std::string arg_shared_mem_name = command_line::get_arg(vm, beldex::arg_integration_test_shared_mem_name);
+      beldex::init_integration_test_context(arg_shared_mem_name);
     }
 #endif
 
@@ -1761,7 +1761,7 @@ namespace cryptonote
     m_mempool.on_idle();
 
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
-    loki::core_is_idle = true;
+    beldex::core_is_idle = true;
 #endif
 
     return true;
diff --git a/src/cryptonote_core/master_node_list.cpp b/src/cryptonote_core/master_node_list.cpp
index 9d9fdc373b..cf8bd4500c 100644
--- a/src/cryptonote_core/master_node_list.cpp
+++ b/src/cryptonote_core/master_node_list.cpp
@@ -1802,7 +1802,7 @@ namespace master_nodes
     }
 
     //
-    // FIXME(doyle): FIXME(loki) !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    // FIXME(doyle): FIXME(beldex) !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // This is temporary code to redistribute the insufficient portion dust
     // amounts between contributors. It should be removed in HF12.
     //
@@ -1810,13 +1810,13 @@ namespace master_nodes
     std::array<uint64_t, MAX_NUMBER_OF_CONTRIBUTORS * master_nodes::MAX_KEY_IMAGES_PER_CONTRIBUTOR> min_contributions;
     {
       // NOTE: Calculate excess portions from each contributor
-      uint64_t loki_reserved = 0;
+      uint64_t beldex_reserved = 0;
       for (size_t index = 0; index < addr_to_portions.size(); ++index)
       {
         addr_to_portion_t const &addr_to_portion = addr_to_portions[index];
-        uint64_t min_contribution_portions       = master_nodes::get_min_node_contribution_in_portions(hf_version, staking_requirement, loki_reserved, index);
-        uint64_t loki_amount                     = master_nodes::portions_to_amount(staking_requirement, addr_to_portion.portions);
-        loki_reserved                           += loki_amount;
+        uint64_t min_contribution_portions       = master_nodes::get_min_node_contribution_in_portions(hf_version, staking_requirement, beldex_reserved, index);
+        uint64_t beldex_amount                     = master_nodes::portions_to_amount(staking_requirement, addr_to_portion.portions);
+        beldex_reserved                           += beldex_amount;
 
         uint64_t excess = 0;
         if (addr_to_portion.portions > min_contribution_portions)
@@ -1885,8 +1885,8 @@ namespace master_nodes
       portions_left += portions_to_steal;
       result.addresses.push_back(addr_to_portion.info.address);
       result.portions.push_back(addr_to_portion.portions);
-      uint64_t loki_amount = master_nodes::portions_to_amount(addr_to_portion.portions, staking_requirement);
-      total_reserved      += loki_amount;
+      uint64_t beldex_amount = master_nodes::portions_to_amount(addr_to_portion.portions, staking_requirement);
+      total_reserved      += beldex_amount;
     }
 
     result.success = true;
diff --git a/src/cryptonote_core/master_node_quorum_cop.cpp b/src/cryptonote_core/master_node_quorum_cop.cpp
index b93bab9503..5b4b020b3d 100644
--- a/src/cryptonote_core/master_node_quorum_cop.cpp
+++ b/src/cryptonote_core/master_node_quorum_cop.cpp
@@ -33,7 +33,7 @@
 #include "cryptonote_core.h"
 #include "version.h"
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 #undef BELDEX_DEFAULT_LOG_CATEGORY
 #define BELDEX_DEFAULT_LOG_CATEGORY "quorum_cop"
diff --git a/src/cryptonote_core/master_node_rules.cpp b/src/cryptonote_core/master_node_rules.cpp
index cb160650c8..55649e7b46 100644
--- a/src/cryptonote_core/master_node_rules.cpp
+++ b/src/cryptonote_core/master_node_rules.cpp
@@ -1,5 +1,5 @@
 #include "cryptonote_config.h"
-#include "common/loki.h"
+#include "common/beldex.h"
 #include "int-util.h"
 #include <vector>
 #include <boost/lexical_cast.hpp>
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index cc781e7f2d..79e922a923 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -993,7 +993,7 @@ namespace cryptonote
       auto time_from_epoh = point.time_since_epoch();
       auto sec = duration_cast< seconds >( time_from_epoh ).count();*/
 
-    //epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-loki/net/req-all.data", sec, get_avg_block_size());
+    //epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-beldex/net/req-all.data", sec, get_avg_block_size());
 
     if(context.m_last_response_height > arg.current_blockchain_height)
     {
@@ -1875,7 +1875,7 @@ skip:
         context.m_last_request_time = boost::posix_time::microsec_clock::universal_time();
         MLOG_P2P_MESSAGE("-->>NOTIFY_REQUEST_GET_OBJECTS: blocks.size()=" << req.blocks.size() << ", txs.size()=" << req.txs.size()
             << "requested blocks count=" << count << " / " << count_limit << " from " << span.first << ", first hash " << req.blocks.front());
-        //epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-loki/net/req-all.data", sec, get_avg_block_size());
+        //epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-beldex/net/req-all.data", sec, get_avg_block_size());
 
         post_notify<NOTIFY_REQUEST_GET_OBJECTS>(req, context);
         MLOG_PEER_STATE("requesting objects");
@@ -1952,7 +1952,7 @@ skip:
 
       //std::string blob; // for calculate size of request
       //epee::serialization::store_t_to_binary(r, blob);
-      //epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-loki/net/req-all.data", sec, get_avg_block_size());
+      //epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-beldex/net/req-all.data", sec, get_avg_block_size());
       //LOG_PRINT_CCONTEXT_L1("r = " << 200);
 
       context.m_last_request_time = boost::posix_time::microsec_clock::universal_time();
diff --git a/src/daemon/command_server.cpp b/src/daemon/command_server.cpp
index ed4a3a6468..f52acd5583 100644
--- a/src/daemon/command_server.cpp
+++ b/src/daemon/command_server.cpp
@@ -33,7 +33,7 @@
 #include "string_tools.h"
 #include "daemon/command_server.h"
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 
 #undef BELDEX_DEFAULT_LOG_CATEGORY
@@ -372,28 +372,28 @@ bool t_command_server::start_handling(std::function<void(void)> exit_handler)
   auto handle_shared_mem_ins_and_outs = [&]()
   {
     // TODO(doyle): Hack, don't hook into input until the daemon has completely initialised, i.e. you can print the status
-    while(!loki::core_is_idle) {}
+    while(!beldex::core_is_idle) {}
     mlog_set_categories("");
 
     for (;;)
     {
-      loki::fixed_buffer const input = loki::read_from_stdin_shared_mem();
-      std::vector<std::string> args  = loki::separate_stdin_to_space_delim_args(&input);
+      beldex::fixed_buffer const input = beldex::read_from_stdin_shared_mem();
+      std::vector<std::string> args  = beldex::separate_stdin_to_space_delim_args(&input);
       {
-        boost::unique_lock<boost::mutex> scoped_lock(loki::integration_test_mutex);
-        loki::use_standard_cout();
+        boost::unique_lock<boost::mutex> scoped_lock(beldex::integration_test_mutex);
+        beldex::use_standard_cout();
         std::cout << input.data << std::endl;
-        loki::use_redirected_cout();
+        beldex::use_redirected_cout();
       }
 
       process_command_vec(args);
       if (args.size() == 1 && args[0] == "exit")
       {
-        loki::deinit_integration_test_context();
+        beldex::deinit_integration_test_context();
         break;
       }
 
-      loki::write_redirected_stdout_to_shared_mem();
+      beldex::write_redirected_stdout_to_shared_mem();
     }
   };
   static std::thread handle_remote_stdin_out_thread(handle_shared_mem_ins_and_outs);
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 2cf6b3e85a..b0886952e1 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -182,7 +182,7 @@ int main(int argc, char const * argv[])
     }
 
     // data_dir
-    //   default: e.g. ~/.loki/ or ~/.loki/testnet
+    //   default: e.g. ~/.beldex/ or ~/.beldex/testnet
     //   if data-dir argument given:
     //     absolute path
     //     relative path: relative to cwd
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index 7cb2ffe713..9553a00859 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -41,7 +41,7 @@
 #include "cryptonote_basic/hardfork.h"
 #include <boost/format.hpp>
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 #include <fstream>
 #include <ctime>
@@ -62,8 +62,8 @@ namespace {
     std::cout << prompt << std::flush;
     std::string result;
 #if defined (BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
-    loki::write_redirected_stdout_to_shared_mem();
-    loki::fixed_buffer buffer = loki::read_from_stdin_shared_mem();
+    beldex::write_redirected_stdout_to_shared_mem();
+    beldex::fixed_buffer buffer = beldex::read_from_stdin_shared_mem();
     result.reserve(buffer.len);
     result = buffer.data;
 #else
diff --git a/src/daemonizer/posix_fork.cpp b/src/daemonizer/posix_fork.cpp
index 737a6c8872..a761b71e87 100644
--- a/src/daemonizer/posix_fork.cpp
+++ b/src/daemonizer/posix_fork.cpp
@@ -120,7 +120,7 @@ void fork(const std::string & pidfile)
   if (!tmpdir)
     tmpdir = TMPDIR;
   std::string output = tmpdir;
-  output += "/loki.daemon.stdout.stderr";
+  output += "/beldex.daemon.stdout.stderr";
   const int flags = O_WRONLY | O_CREAT | O_APPEND;
   const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
   if (open(output.c_str(), flags, mode) < 0)
diff --git a/src/gen_multisig/gen_multisig.cpp b/src/gen_multisig/gen_multisig.cpp
index 96099dbbf5..04fe1dc33f 100644
--- a/src/gen_multisig/gen_multisig.cpp
+++ b/src/gen_multisig/gen_multisig.cpp
@@ -179,12 +179,12 @@ int main(int argc, char* argv[])
   bool should_terminate = false;
   std::tie(vm, should_terminate) = wallet_args::main(
    argc, argv,
-   "loki-gen-multisig [(--testnet|--stagenet)] [--filename-base=<filename>] [--scheme=M/N] [--threshold=M] [--participants=N]",
+   "beldex-gen-multisig [(--testnet|--stagenet)] [--filename-base=<filename>] [--scheme=M/N] [--threshold=M] [--participants=N]",
     genms::tr("This program generates a set of multisig wallets - use this simpler scheme only if all the participants trust each other"),
     desc_params,
     boost::program_options::positional_options_description(),
     [](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; },
-    "loki-gen-multisig.log"
+    "beldex-gen-multisig.log"
   );
   if (!vm)
     return 1;
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index 357ce06d9b..28be6f4938 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -136,8 +136,8 @@ namespace nodetool
   private:
     const std::vector<std::string> m_seed_nodes_list =
     {
-      // TODO(beldex): "seeds.loki.network"
-	  "34.85.44.103:19090",
+      // TODO(beldex): "seeds.beldexcoin.com"
+	    "34.85.44.103:19090",
       "35.211.123.115:19090",
       "35.228.216.218:19090",
       "35.228.9.140:19090",
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index aee956d649..e8cd76d07f 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -37,7 +37,7 @@ using namespace epee;
 #include "common/command_line.h"
 #include "common/updates.h"
 #include "common/download.h"
-#include "common/loki.h"
+#include "common/beldex.h"
 #include "common/util.h"
 #include "common/perf_timer.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
@@ -2559,7 +2559,7 @@ namespace cryptonote
     for (const auto& key : keys)
     {
       std::string const hex64 = string_tools::pod_to_hex(key);
-      res.keys[i++]           = loki::hex64_to_base32z(hex64);
+      res.keys[i++]           = beldex::hex64_to_base32z(hex64);
     }
     return true;
   }
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 8370aa104b..2298a92a55 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -57,7 +57,7 @@
 #include "common/dns_utils.h"
 #include "common/base58.h"
 #include "common/scoped_message_writer.h"
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"
 #include "cryptonote_core/master_node_deregister.h"
 #include "cryptonote_core/master_node_list.h"
@@ -264,8 +264,8 @@ namespace
     std::string buf;
     if (yesno) std::cout << prompt << " (Y/Yes/N/No): ";
     else       std::cout << prompt << ": ";
-    loki::write_redirected_stdout_to_shared_mem();
-    loki::fixed_buffer buffer = loki::read_from_stdin_shared_mem();
+    beldex::write_redirected_stdout_to_shared_mem();
+    beldex::fixed_buffer buffer = beldex::read_from_stdin_shared_mem();
     buf.reserve(buffer.len);
     buf = buffer.data;
     return epee::string_tools::trim(buf);
@@ -297,8 +297,8 @@ namespace
   {
 #if defined (BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
     std::cout << prompt;
-    loki::write_redirected_stdout_to_shared_mem();
-    loki::fixed_buffer buffer = loki::read_from_stdin_shared_mem();
+    beldex::write_redirected_stdout_to_shared_mem();
+    beldex::fixed_buffer buffer = beldex::read_from_stdin_shared_mem();
     epee::wipeable_string buf = buffer.data;
 #else
 
@@ -323,7 +323,7 @@ namespace
   {
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
     std::cout << prompt << ": NOTE(beldex): Passwords not supported, defaulting to empty password";
-    loki::write_redirected_stdout_to_shared_mem();
+    beldex::write_redirected_stdout_to_shared_mem();
     tools::password_container pwd_container(std::string(""));
 #else
   #ifdef HAVE_READLINE
@@ -2668,7 +2668,7 @@ simple_wallet::simple_wallet()
                                   "  Set the fee to default/unimportant/normal/elevated/priority.\n "
                                   "confirm-missing-payment-id <1|0>\n "
                                   "ask-password <0|1|2   (or never|action|decrypt)>\n "
-                                  "unit <loki|megarok|kilorok|rok>\n "
+                                  "unit <beldex|megabdx|kilobdx|bdx>\n "
                                   "  Set the default beldex (sub-)unit.\n "
                                   "min-outputs-count [n]\n "
                                   "  Try to keep at least that many outputs of value at least min-outputs-value.\n "
@@ -3085,7 +3085,7 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args)
     CHECK_SIMPLE_VARIABLE("priority", set_default_priority, tr("0, 1, 2, 3, or 4, or one of ") << join_priority_strings(", "));
     CHECK_SIMPLE_VARIABLE("confirm-missing-payment-id", set_confirm_missing_payment_id, tr("0 or 1"));
     CHECK_SIMPLE_VARIABLE("ask-password", set_ask_password, tr("0|1|2 (or never|action|decrypt)"));
-    CHECK_SIMPLE_VARIABLE("unit", set_unit, tr("loki, megarok, kilorok, rok"));
+    CHECK_SIMPLE_VARIABLE("unit", set_unit, tr("beldex, megabdx, kilobdx, bdx"));
     CHECK_SIMPLE_VARIABLE("min-outputs-count", set_min_output_count, tr("unsigned integer"));
     CHECK_SIMPLE_VARIABLE("min-outputs-value", set_min_output_value, tr("amount"));
     CHECK_SIMPLE_VARIABLE("merge-destinations", set_merge_destinations, tr("0 or 1"));
@@ -8181,23 +8181,23 @@ bool simple_wallet::run()
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
   for (;;)
   {
-    loki::fixed_buffer const input = loki::read_from_stdin_shared_mem();
-    std::vector<std::string> args  = loki::separate_stdin_to_space_delim_args(&input);
+    beldex::fixed_buffer const input = beldex::read_from_stdin_shared_mem();
+    std::vector<std::string> args  = beldex::separate_stdin_to_space_delim_args(&input);
     {
-      boost::unique_lock<boost::mutex> scoped_lock(loki::integration_test_mutex);
-      loki::use_standard_cout();
+      boost::unique_lock<boost::mutex> scoped_lock(beldex::integration_test_mutex);
+      beldex::use_standard_cout();
       std::cout << input.data << std::endl;
-      loki::use_redirected_cout();
+      beldex::use_redirected_cout();
     }
 
     this->process_command(args);
     if (args.size() == 1 && args[0] == "exit")
     {
-      loki::deinit_integration_test_context();
+      beldex::deinit_integration_test_context();
       return true;
     }
 
-    loki::write_redirected_stdout_to_shared_mem();
+    beldex::write_redirected_stdout_to_shared_mem();
   }
 #endif
 
@@ -9360,12 +9360,12 @@ int main(int argc, char* argv[])
   bool should_terminate = false;
   std::tie(vm, should_terminate) = wallet_args::main(
    argc, argv,
-   "loki-wallet-cli [--wallet-file=<filename>|--generate-new-wallet=<filename>] [<COMMAND>]",
+   "beldex-wallet-cli [--wallet-file=<filename>|--generate-new-wallet=<filename>] [<COMMAND>]",
     sw::tr("This is the command line Beldex wallet. It needs to connect to a Beldex\ndaemon to work correctly.\n\nWARNING: Do not reuse your Beldex keys on a contentious fork, doing so will harm your privacy.\n Only consider reusing your key on a contentious fork if the fork has key reuse mitigations built in."),
     desc_params,
     positional_options,
     [](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; },
-    "loki-wallet-cli.log"
+    "beldex-wallet-cli.log"
   );
 
   if (!vm)
diff --git a/src/version.cpp.in b/src/version.cpp.in
index 57eeb4330c..49acb4ba75 100644
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -1,4 +1,4 @@
-#define DEF_BELDEX_VERSION_MAJOR 0
+#define DEF_BELDEX_VERSION_MAJOR 3
 #define DEF_BELDEX_VERSION_MINOR 1
 #define DEF_BELDEX_VERSION_PATCH 2
 
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index d1c64ea705..ea23eedcb0 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -66,7 +66,7 @@ namespace Monero {
 
 namespace {
     // copy-pasted from simplewallet
-    static const size_t DEFAULT_MIXIN = 6;
+    static const size_t DEFAULT_MIXIN = CRYPTONOTE_DEFAULT_TX_MIXIN;
     static const int    DEFAULT_REFRESH_INTERVAL_MILLIS = 1000 * 10;
     // limit maximum refresh interval as one minute
     static const int    MAX_REFRESH_INTERVAL_MILLIS = 1000 * 60 * 1;
@@ -78,7 +78,7 @@ namespace {
     std::string get_default_ringdb_path(cryptonote::network_type nettype)
     {
       boost::filesystem::path dir = tools::get_default_data_dir();
-      // remove .loki, replace with .shared-ringdb
+      // remove .beldex, replace with .shared-ringdb
       dir = dir.remove_filename();
       dir /= ".shared-ringdb";
       if (nettype == cryptonote::TESTNET)
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 9490915444..6929fbe9c7 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -80,7 +80,7 @@ using namespace epee;
 
 #include "cryptonote_core/master_node_list.h"
 #include "cryptonote_core/master_node_rules.h"
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 extern "C"
 {
@@ -7867,11 +7867,6 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
         max_rct_index = std::max(max_rct_index, m_transfers[idx].m_global_output_index);
       }
 
-    std::vector<uint64_t> output_blacklist;
-    if (bool get_output_blacklist_failed = !get_output_blacklist(output_blacklist))
-      THROW_WALLET_EXCEPTION_IF(get_output_blacklist_failed, error::get_output_blacklist, "Couldn't retrive list of outputs that are to be exlcuded from selection");
-
-    std::sort(output_blacklist.begin(), output_blacklist.end());
     const bool has_rct_distribution = has_rct && get_rct_distribution(rct_start_height, rct_offsets);
     if (has_rct_distribution)
     {
@@ -7882,6 +7877,18 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
           error::get_output_distribution, "Daemon reports suspicious number of rct outputs");
     }
 
+    std::vector<uint64_t> output_blacklist;
+    if (bool get_output_blacklist_failed = !get_output_blacklist(output_blacklist))
+      THROW_WALLET_EXCEPTION_IF(get_output_blacklist_failed, error::get_output_blacklist, "Couldn't retrive list of outputs that are to be exlcuded from selection");
+
+    std::sort(output_blacklist.begin(), output_blacklist.end());
+    if (output_blacklist.size() * 0.05 > (double)rct_offsets.size())
+    {
+      MWARNING("More than 5% of outputs are blacklisted ("
+               << output_blacklist.size() << "/" << rct_offsets.size()
+               << "), please notify the Beldex developers");
+    }
+
     // get histogram for the amounts we need
     cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::request req_t = AUTO_VAL_INIT(req_t);
     cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::response resp_t = AUTO_VAL_INIT(resp_t);
@@ -8012,26 +8019,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
       if (n_rct == 0)
         return rct_offsets[block_offset] ? rct_offsets[block_offset] - 1 : 0;
       MDEBUG("Picking 1/" << n_rct << " in " << (last_block_offset - first_block_offset + 1) << " blocks centered around " << block_offset + rct_start_height);
-      
-      uint64_t pick = first_rct + crypto::rand<uint64_t>() % n_rct;
-
-      {
-        double percent_of_outputs_blacklisted = output_blacklist.size() / (double)n_rct;
-        if (static_cast<int>(percent_of_outputs_blacklisted + 1) > 5)
-          MWARNING("More than 5 percent of available outputs are blacklisted, please notify the Beldex developers");
-      }
-
-      for (;;)
-      {
-        if (std::binary_search(output_blacklist.begin(), output_blacklist.end(), pick))
-        {
-          pick = first_rct + crypto::rand<uint64_t>() % n_rct;
-        }
-        else
-        {
-          return pick;
-        }
-      }
+      return first_rct + crypto::rand<uint64_t>() % n_rct;
     };
 
     size_t num_selected_transfers = 0;
@@ -8205,20 +8193,20 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
 
         // while we still need more mixins
         uint64_t num_usable_outs = num_outs;
-        bool allow_blackballed = false;
+        bool allow_blackballed_or_blacklisted = false;
         while (num_found < requested_outputs_count)
         {
           // if we've gone through every possible output, we've gotten all we can
           if (seen_indices.size() == num_usable_outs)
           {
-            // there is a first pass which rejects blackballed outputs, then a second pass
-            // which allows them if we don't have enough non blackballed outputs to reach
-            // the required amount of outputs (since consensus does not care about blackballed
+            // there is a first pass which rejects blackballed/listed outputs, then a second pass
+            // which allows them if we don't have enough non blackballed/list outputs to reach
+            // the required amount of outputs (since consensus does not care about blackballed/listed
             // outputs, we still need to reach the minimum ring size)
-            if (allow_blackballed)
+            if (allow_blackballed_or_blacklisted)
               break;
-            MINFO("Not enough output not marked as spent, we'll allow outputs marked as spent");
-            allow_blackballed = true;
+            MINFO("Not enough output not marked as spent, we'll allow outputs marked as spent and outputs with known destinations and amounts");
+            allow_blackballed_or_blacklisted = true;
             num_usable_outs = num_outs;
           }
 
@@ -8294,10 +8282,14 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
 
           if (seen_indices.count(i))
             continue;
-          if (!allow_blackballed && is_output_blackballed(std::make_pair(amount, i))) // don't add blackballed outputs
+          if (!allow_blackballed_or_blacklisted)
           {
-            --num_usable_outs;
-            continue;
+            if (is_output_blackballed(std::make_pair(amount, i)) ||
+                std::binary_search(output_blacklist.begin(), output_blacklist.end(), i))
+            {
+              --num_usable_outs;
+              continue;
+            }
           }
           seen_indices.emplace(i);
 
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 406fe23eca..937ed5ad1a 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -64,7 +64,7 @@
 #include "node_rpc_proxy.h"
 #include "message_store.h"
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 #undef BELDEX_DEFAULT_LOG_CATEGORY
 #define BELDEX_DEFAULT_LOG_CATEGORY "wallet.wallet2"
diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp
index ee6a322852..ff9b909f66 100644
--- a/src/wallet/wallet_args.cpp
+++ b/src/wallet/wallet_args.cpp
@@ -37,7 +37,7 @@
 #include "string_tools.h"
 #include "version.h"
 
-#include "common/loki_integration_test_hooks.h"
+#include "common/beldex_integration_test_hooks.h"
 
 #if defined(WIN32)
 #include <crtdbg.h>
@@ -130,7 +130,7 @@ namespace wallet_args
     command_line::add_arg(desc_params, arg_config_file);
 
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
-    command_line::add_arg(desc_params, loki::arg_integration_test_shared_mem_name);
+    command_line::add_arg(desc_params, beldex::arg_integration_test_shared_mem_name);
 #endif
 
     i18n_set_language("translations", "beldex", lang);
@@ -146,8 +146,8 @@ namespace wallet_args
 
 #if defined(BELDEX_ENABLE_INTEGRATION_TEST_HOOKS)
       {
-        const std::string arg_shared_mem_name = command_line::get_arg(vm, loki::arg_integration_test_shared_mem_name);
-        loki::init_integration_test_context(arg_shared_mem_name);
+        const std::string arg_shared_mem_name = command_line::get_arg(vm, beldex::arg_integration_test_shared_mem_name);
+        beldex::init_integration_test_context(arg_shared_mem_name);
       }
 #endif
 
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 177ba2b97c..20c57ba084 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -206,7 +206,7 @@ namespace tools
           string_encoding::base64_encode(rand_128bit.data(), rand_128bit.size())
         );
 
-        std::string temp = "loki-wallet-rpc." + bind_port + ".login";
+        std::string temp = "beldex-wallet-rpc." + bind_port + ".login";
         rpc_login_file = tools::private_file::create(temp);
         if (!rpc_login_file.handle())
         {
@@ -4137,12 +4137,12 @@ int main(int argc, char** argv) {
   bool should_terminate = false;
   std::tie(vm, should_terminate) = wallet_args::main(
     argc, argv,
-    "loki-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
+    "beldex-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
     tools::wallet_rpc_server::tr("This is the RPC beldex wallet. It needs to connect to a beldex\ndaemon to work correctly."),
     desc_params,
     po::positional_options_description(),
     [](const std::string &s, bool emphasis){ epee::set_console_color(emphasis ? epee::console_color_white : epee::console_color_default, true); std::cout << s << std::endl; if (emphasis) epee::reset_console_color(); },
-    "loki-wallet-rpc.log",
+    "beldex-wallet-rpc.log",
     true
   );
   if (!vm)
diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h
index dc18999e42..f7760637b6 100644
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@@ -2340,7 +2340,7 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(allow_openalias, false)
       END_KV_SERIALIZE_MAP()
     };
-    // TODO(doyle): FIXME(loki): When the associated commit from upstream Monero is merged
+    // TODO(doyle): FIXME(beldex): When the associated commit from upstream Monero is merged
     // typedef epee::misc_utils::struct_init<request_t> request;
 
     struct response
diff --git a/tests/unit_tests/json_serialization.cpp b/tests/unit_tests/json_serialization.cpp
index f99f3c9534..92272c4df5 100644
--- a/tests/unit_tests/json_serialization.cpp
+++ b/tests/unit_tests/json_serialization.cpp
@@ -60,7 +60,7 @@ namespace
 
             int num_outputs_to_use = static_cast<int>(source.vout.size());
             if (num_outputs_to_use > 0 && is_miner_tx)
-              --num_outputs_to_use; // NOTE:(loki): Don't try to transfer the governance reward which is always the last one
+              --num_outputs_to_use; // NOTE:(beldex): Don't try to transfer the governance reward which is always the last one
 
             for (int output_index = 0; output_index < num_outputs_to_use; ++output_index)
             {
diff --git a/utils/build_scripts/make-release.sh b/utils/build_scripts/make-release.sh
index eae3036fef..805c2e66d5 100755
--- a/utils/build_scripts/make-release.sh
+++ b/utils/build_scripts/make-release.sh
@@ -17,7 +17,7 @@ then
   exit
 fi
 
-WORKING_DIR=loki-$version
+WORKING_DIR=beldex-$version
 
 echo "Working in $WORKING_DIR..."