diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 684e04e5b2..34e18674f2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -10,7 +10,7 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    if: github.event_name != 'schedule' || github.repository == 'placeholderkv/placeholderkv'
+    if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey'
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 4ffd72fef7..35ea844ea7 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -8,16 +8,16 @@ on:
   workflow_dispatch:
 jobs:
   coverity:
-    if: github.repository == 'placeholderkv/placeholderkv'
+    if: github.repository == 'valkey-io/valkey'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@main
     - name: Download and extract the Coverity Build Tool
       run: |
-          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=placeholderkv-unstable" -O cov-analysis-linux64.tar.gz
+          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=valkey-unstable" -O cov-analysis-linux64.tar.gz
           mkdir cov-analysis-linux64
           tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
-    - name: Install placeholderkv dependencies
+    - name: Install valkey dependencies
       run: sudo apt install -y gcc tcl8.6 tclx procps libssl-dev
     - name: Build with cov-build
       run: cov-analysis-linux64/bin/cov-build --dir cov-int make
@@ -25,7 +25,7 @@ jobs:
       run: |
           tar czvf cov-int.tgz cov-int
           curl \
-            --form project=placeholderkv-unstable \
+            --form project=valkey-unstable \
             --form email=${{ secrets.COVERITY_SCAN_EMAIL }} \
             --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
             --form file=@cov-int.tgz \
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 41304202ca..e6b57085db 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -10,7 +10,7 @@ on:
         default: 'valgrind,sanitizer,tls,freebsd,macos,alpine,32bit,iothreads,ubuntu,centos,malloc,specific,fortify,reply-schema'
       skiptests:
         description: 'tests to skip (delete the ones you wanna keep, do not leave empty)'
-        default: 'placeholderkv,modules,sentinel,cluster,unittest'
+        default: 'valkey,modules,sentinel,cluster,unittest'
       test_args:
         description: 'extra test arguments'
         default: ''
@@ -19,7 +19,7 @@ on:
         default: ''
       use_repo:
         description: 'repo owner and name'
-        default: 'placeholderkv/placeholderkv'
+        default: 'valkey-io'
       use_git_ref:
         description: 'git branch or sha to use'
         default: 'unstable'
@@ -30,7 +30,7 @@ jobs:
   test-ubuntu-jemalloc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'ubuntu')
     timeout-minutes: 14400
     steps:
@@ -52,7 +52,7 @@ jobs:
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -65,12 +65,12 @@ jobs:
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
     - name: unittest
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
-      run: ./src/placeholderkv-server test all --accurate
+      run: ./src/valkey-server test all --accurate
 
   test-ubuntu-jemalloc-fortify:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'fortify')
     container: ubuntu:lunar
     timeout-minutes: 14400
@@ -96,7 +96,7 @@ jobs:
     - name: testprep
       run: apt-get install -y tcl8.6 tclx procps
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -109,12 +109,12 @@ jobs:
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
     - name: unittest
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
-      run: ./src/placeholderkv-server test all --accurate
+      run: ./src/valkey-server test all --accurate
 
   test-ubuntu-libc-malloc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'malloc')
     timeout-minutes: 14400
     steps:
@@ -136,7 +136,7 @@ jobs:
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -151,7 +151,7 @@ jobs:
   test-ubuntu-no-malloc-usable-size:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'malloc')
     timeout-minutes: 14400
     steps:
@@ -173,7 +173,7 @@ jobs:
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -188,7 +188,7 @@ jobs:
   test-ubuntu-32bit:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, '32bit')
     timeout-minutes: 14400
     steps:
@@ -212,7 +212,7 @@ jobs:
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -227,12 +227,12 @@ jobs:
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
     - name: unittest
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
-      run: ./src/placeholderkv-server test all --accurate
+      run: ./src/valkey-server test all --accurate
 
   test-ubuntu-tls:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'tls')
     timeout-minutes: 14400
     steps:
@@ -257,7 +257,7 @@ jobs:
         sudo apt-get install tcl8.6 tclx tcl-tls
         ./utils/gen-test-certs.sh
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: |
         ./runtest --accurate --verbose --dump-logs --tls --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
@@ -276,7 +276,7 @@ jobs:
   test-ubuntu-tls-no-tls:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'tls')
     timeout-minutes: 14400
     steps:
@@ -301,7 +301,7 @@ jobs:
         sudo apt-get install tcl8.6 tclx tcl-tls
         ./utils/gen-test-certs.sh
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: |
         ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
@@ -320,7 +320,7 @@ jobs:
   test-ubuntu-io-threads:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'iothreads')
     timeout-minutes: 14400
     steps:
@@ -343,7 +343,7 @@ jobs:
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --config io-threads 4 --config io-threads-do-reads yes --accurate --verbose --tags network --dump-logs ${{github.event.inputs.test_args}}
     - name: cluster tests
       if: true && !contains(github.event.inputs.skiptests, 'cluster')
@@ -352,7 +352,7 @@ jobs:
   test-ubuntu-reclaim-cache:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'specific')
     timeout-minutes: 14400
     steps:
@@ -379,19 +379,19 @@ jobs:
         mkdir /tmp/slave
     - name: warm up
       run: |
-        ./src/placeholderkv-server --daemonize yes --logfile /dev/null
-        ./src/placeholderkv-benchmark -n 1 > /dev/null
-        ./src/placeholderkv-cli save | grep OK > /dev/null
+        ./src/valkey-server --daemonize yes --logfile /dev/null
+        ./src/valkey-benchmark -n 1 > /dev/null
+        ./src/valkey-cli save | grep OK > /dev/null
         vmtouch -v ./dump.rdb > /dev/null
     - name: test
       run: |
         echo "test SAVE doesn't increase cache"
         CACHE0=$(grep -w file /sys/fs/cgroup/memory.stat | awk '{print $2}')
         echo "$CACHE0"
-        ./src/placeholderkv-server --daemonize yes --logfile /dev/null --dir /tmp/master --port 8080 --repl-diskless-sync no --pidfile /tmp/master/placeholderkv.pid --rdbcompression no --enable-debug-command yes
-        ./src/placeholderkv-cli -p 8080 debug populate 10000 k 102400
-        ./src/placeholderkv-server --daemonize yes --logfile /dev/null --dir /tmp/slave --port 8081 --repl-diskless-load disabled --rdbcompression no
-        ./src/placeholderkv-cli -p 8080 save > /dev/null
+        ./src/valkey-server --daemonize yes --logfile /dev/null --dir /tmp/master --port 8080 --repl-diskless-sync no --pidfile /tmp/master/valkey.pid --rdbcompression no --enable-debug-command yes
+        ./src/valkey-cli -p 8080 debug populate 10000 k 102400
+        ./src/valkey-server --daemonize yes --logfile /dev/null --dir /tmp/slave --port 8081 --repl-diskless-load disabled --rdbcompression no
+        ./src/valkey-cli -p 8080 save > /dev/null
         VMOUT=$(vmtouch -v /tmp/master/dump.rdb)
         echo $VMOUT
         grep -q " 0%" <<< $VMOUT 
@@ -400,8 +400,8 @@ jobs:
         if [ "$(( $CACHE-$CACHE0 ))" -gt "8000000" ]; then exit 1; fi
 
         echo "test replication doesn't increase cache"
-        ./src/placeholderkv-cli -p 8081 REPLICAOF 127.0.0.1 8080 > /dev/null
-        while [ $(./src/placeholderkv-cli -p 8081 info replication | grep "master_link_status:down") ]; do sleep 1; done;
+        ./src/valkey-cli -p 8081 REPLICAOF 127.0.0.1 8080 > /dev/null
+        while [ $(./src/valkey-cli -p 8081 info replication | grep "master_link_status:down") ]; do sleep 1; done;
         sleep 1 # wait for the completion of cache reclaim bio
         VMOUT=$(vmtouch -v /tmp/master/dump.rdb)
         echo $VMOUT
@@ -414,11 +414,11 @@ jobs:
         if [ "$(( $CACHE-$CACHE0 ))" -gt "8000000" ]; then exit 1; fi
         
         echo "test reboot doesn't increase cache"
-        PID=$(cat /tmp/master/placeholderkv.pid)
+        PID=$(cat /tmp/master/valkey.pid)
         kill -15 $PID
         while [ -x /proc/${PID} ]; do sleep 1; done
-        ./src/placeholderkv-server --daemonize yes --logfile /dev/null --dir /tmp/master --port 8080
-        while [ $(./src/placeholderkv-cli -p 8080 info persistence | grep "loading:1") ]; do sleep 1; done;
+        ./src/valkey-server --daemonize yes --logfile /dev/null --dir /tmp/master --port 8080
+        while [ $(./src/valkey-cli -p 8080 info persistence | grep "loading:1") ]; do sleep 1; done;
         sleep 1 # wait for the completion of cache reclaim bio
         VMOUT=$(vmtouch -v /tmp/master/dump.rdb)
         echo $VMOUT
@@ -430,8 +430,8 @@ jobs:
   test-valgrind-test:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
-      !contains(github.event.inputs.skipjobs, 'valgrind') && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
+      !contains(github.event.inputs.skipjobs, 'valgrind') && !contains(github.event.inputs.skiptests, 'valkey')
     timeout-minutes: 14400
     steps:
     - name: prep
@@ -454,13 +454,13 @@ jobs:
         sudo apt-get update
         sudo apt-get install tcl8.6 tclx valgrind -y
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --valgrind --no-latency --verbose --clients 1 --timeout 2400 --dump-logs ${{github.event.inputs.test_args}}
 
   test-valgrind-misc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'valgrind') && !(contains(github.event.inputs.skiptests, 'modules') && contains(github.event.inputs.skiptests, 'unittest'))
     timeout-minutes: 14400
     steps:
@@ -489,14 +489,14 @@ jobs:
     - name: unittest
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
       run: |
-        valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/placeholderkv-server test all --valgrind
+        valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/valkey-server test all --valgrind
         if grep -q 0x err.txt; then cat err.txt; exit 1; fi
 
   test-valgrind-no-malloc-usable-size-test:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
-      !contains(github.event.inputs.skipjobs, 'valgrind') && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
+      !contains(github.event.inputs.skipjobs, 'valgrind') && !contains(github.event.inputs.skiptests, 'valkey')
     timeout-minutes: 14400
     steps:
     - name: prep
@@ -519,13 +519,13 @@ jobs:
         sudo apt-get update
         sudo apt-get install tcl8.6 tclx valgrind -y
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --valgrind --no-latency --verbose --clients 1 --timeout 2400 --dump-logs ${{github.event.inputs.test_args}}
 
   test-valgrind-no-malloc-usable-size-misc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'valgrind') && !(contains(github.event.inputs.skiptests, 'modules') && contains(github.event.inputs.skiptests, 'unittest'))
     timeout-minutes: 14400
     steps:
@@ -554,13 +554,13 @@ jobs:
     - name: unittest
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
       run: |
-        valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/placeholderkv-server test all --valgrind
+        valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/valkey-server test all --valgrind
         if grep -q 0x err.txt; then cat err.txt; exit 1; fi
 
   test-sanitizer-address:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'sanitizer')
     timeout-minutes: 14400
     strategy:
@@ -591,7 +591,7 @@ jobs:
           sudo apt-get install tcl8.6 tclx -y
           sudo sysctl vm.mmap_rnd_bits=28
       - name: test
-        if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+        if: true && !contains(github.event.inputs.skiptests, 'valkey')
         run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
       - name: module api test
         if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -604,12 +604,12 @@ jobs:
         run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
       - name: unittest
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
-        run: ./src/placeholderkv-server test all
+        run: ./src/valkey-server test all
 
   test-sanitizer-undefined:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'sanitizer')
     timeout-minutes: 14400
     strategy:
@@ -638,7 +638,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install tcl8.6 tclx -y
       - name: test
-        if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+        if: true && !contains(github.event.inputs.skiptests, 'valkey')
         run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
       - name: module api test
         if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -651,12 +651,12 @@ jobs:
         run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
       - name: unittest
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
-        run: ./src/placeholderkv-server test all --accurate
+        run: ./src/valkey-server test all --accurate
 
   test-centos7-jemalloc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'centos')
     container: centos:7
     timeout-minutes: 14400
@@ -681,7 +681,7 @@ jobs:
     - name: testprep
       run: yum -y install which tcl tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -696,7 +696,7 @@ jobs:
   test-centos7-tls-module:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'tls')
     container: centos:7
     timeout-minutes: 14400
@@ -724,7 +724,7 @@ jobs:
         yum -y install tcl tcltls tclx
         ./utils/gen-test-certs.sh
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: |
         ./runtest --accurate --verbose --dump-logs --tls-module --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
@@ -743,7 +743,7 @@ jobs:
   test-centos7-tls-module-no-tls:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'tls')
     container: centos:7
     timeout-minutes: 14400
@@ -771,7 +771,7 @@ jobs:
         yum -y install tcl tcltls tclx
         ./utils/gen-test-certs.sh
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: |
         ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
@@ -790,8 +790,8 @@ jobs:
   test-macos-latest:
     runs-on: macos-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
-      !contains(github.event.inputs.skipjobs, 'macos') && !(contains(github.event.inputs.skiptests, 'placeholderkv') && contains(github.event.inputs.skiptests, 'modules'))
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
+      !contains(github.event.inputs.skipjobs, 'macos') && !(contains(github.event.inputs.skiptests, 'valkey') && contains(github.event.inputs.skiptests, 'modules'))
     timeout-minutes: 14400
     steps:
     - name: prep
@@ -810,7 +810,7 @@ jobs:
     - name: make
       run: make SERVER_CFLAGS='-Werror'
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --clients 1 --no-latency --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -819,7 +819,7 @@ jobs:
   test-macos-latest-sentinel:
     runs-on: macos-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'macos') && !contains(github.event.inputs.skiptests, 'sentinel')
     timeout-minutes: 14400
     steps:
@@ -845,7 +845,7 @@ jobs:
   test-macos-latest-cluster:
     runs-on: macos-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'macos') && !contains(github.event.inputs.skiptests, 'cluster')
     timeout-minutes: 14400
     steps:
@@ -874,7 +874,7 @@ jobs:
         os: [macos-11, macos-13]
     runs-on: ${{ matrix.os }}
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'macos')
     timeout-minutes: 14400
     steps:
@@ -900,7 +900,7 @@ jobs:
   test-freebsd:
     runs-on: macos-12
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'freebsd')
     timeout-minutes: 14400
     steps:
@@ -928,7 +928,7 @@ jobs:
   test-alpine-jemalloc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'alpine')
     container: alpine:latest
     steps:
@@ -952,7 +952,7 @@ jobs:
     - name: testprep
       run: apk add tcl procps tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -967,7 +967,7 @@ jobs:
   test-alpine-libc-malloc:
     runs-on: ubuntu-latest
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'alpine')
     container: alpine:latest
     steps:
@@ -991,7 +991,7 @@ jobs:
     - name: testprep
       run: apk add tcl procps tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -1007,7 +1007,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 14400
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'placeholderkv/placeholderkv')) &&
+      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
       !contains(github.event.inputs.skipjobs, 'reply-schema')
     steps:
     - name: prep
@@ -1028,7 +1028,7 @@ jobs:
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
-      if: true && !contains(github.event.inputs.skiptests, 'placeholderkv')
+      if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --log-req-res --no-latency --dont-clean --force-resp3 --tags -slow --verbose --dump-logs  ${{github.event.inputs.test_args}}
     - name: module api test
       if: true && !contains(github.event.inputs.skiptests, 'modules')
@@ -1044,5 +1044,5 @@ jobs:
       with:
         path: "./utils/req-res-validator/requirements.txt"
     - name: validator
-      run: ./utils/req-res-log-validator.py --verbose --fail-missing-reply-schemas ${{ (!contains(github.event.inputs.skiptests, 'placeholderkv') && !contains(github.event.inputs.skiptests, 'module') && !contains(github.event.inputs.sentinel, 'placeholderkv') && !contains(github.event.inputs.skiptests, 'cluster')) && github.event.inputs.test_args == '' && github.event.inputs.cluster_test_args == '' && '--fail-commands-not-all-hit' || '' }}
+      run: ./utils/req-res-log-validator.py --verbose --fail-missing-reply-schemas ${{ (!contains(github.event.inputs.skiptests, 'valkey') && !contains(github.event.inputs.skiptests, 'module') && !contains(github.event.inputs.sentinel, 'valkey') && !contains(github.event.inputs.skiptests, 'cluster')) && github.event.inputs.test_args == '' && github.event.inputs.cluster_test_args == '' && '--fail-commands-not-all-hit' || '' }}
 
diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml
index 3633f00a10..0113858fec 100644
--- a/.github/workflows/external.yml
+++ b/.github/workflows/external.yml
@@ -9,15 +9,15 @@ on:
 jobs:
   test-external-standalone:
     runs-on: ubuntu-latest
-    if: github.event_name != 'schedule' || github.repository == 'placeholderkv/placeholderkv'
+    if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey'
     timeout-minutes: 14400
     steps:
     - uses: actions/checkout@v3
     - name: Build
       run: make SERVER_CFLAGS=-Werror
-    - name: Start placeholderkv-server
+    - name: Start valkey-server
       run: |
-        ./src/placeholderkv-server --daemonize yes --save "" --logfile external-server.log \
+        ./src/valkey-server --daemonize yes --save "" --logfile external-server.log \
           --enable-protected-configs yes --enable-debug-command yes --enable-module-command yes
     - name: Run external test
       run: |
@@ -34,18 +34,18 @@ jobs:
 
   test-external-cluster:
     runs-on: ubuntu-latest
-    if: github.event_name != 'schedule' || github.repository == 'placeholderkv/placeholderkv'
+    if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey'
     timeout-minutes: 14400
     steps:
     - uses: actions/checkout@v3
     - name: Build
       run: make SERVER_CFLAGS=-Werror
-    - name: Start placeholderkv-server
+    - name: Start valkey-server
       run: |
-        ./src/placeholderkv-server --cluster-enabled yes --daemonize yes --save "" --logfile external-server.log \
+        ./src/valkey-server --cluster-enabled yes --daemonize yes --save "" --logfile external-server.log \
           --enable-protected-configs yes --enable-debug-command yes --enable-module-command yes
     - name: Create a single node cluster
-      run: ./src/placeholderkv-cli cluster addslots $(for slot in {0..16383}; do echo $slot; done); sleep 5
+      run: ./src/valkey-cli cluster addslots $(for slot in {0..16383}; do echo $slot; done); sleep 5
     - name: Run external test
       run: |
           ./runtest \
@@ -62,15 +62,15 @@ jobs:
 
   test-external-nodebug:
     runs-on: ubuntu-latest
-    if: github.event_name != 'schedule' || github.repository == 'placeholderkv/placeholderkv'
+    if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey'
     timeout-minutes: 14400
     steps:
       - uses: actions/checkout@v3
       - name: Build
         run: make SERVER_CFLAGS=-Werror
-      - name: Start placeholderkv-server
+      - name: Start valkey-server
         run: |
-          ./src/placeholderkv-server --daemonize yes --save "" --logfile external-server.log
+          ./src/valkey-server --daemonize yes --save "" --logfile external-server.log
       - name: Run external test
         run: |
           ./runtest \
diff --git a/.gitignore b/.gitignore
index 9862c0cc58..5b44493038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,13 @@
 *.d
 *.log
 dump.rdb
-placeholderkv-benchmark
-placeholderkv-check-aof
-placeholderkv-check-rdb
-placeholderkv-check-dump
-placeholderkv-cli
-placeholderkv-sentinel
-placeholderkv-server
+valkey-benchmark
+valkey-check-aof
+valkey-check-rdb
+valkey-check-dump
+valkey-cli
+valkey-sentinel
+valkey-server
 doc-tools
 release
 misc/*
diff --git a/BUGS b/BUGS
index 0c9a1d8e6a..02d5070fe9 100644
--- a/BUGS
+++ b/BUGS
@@ -1 +1 @@
-Please check https://github.com/placeholderkv/placeholderkv/issues
+Please check https://github.com/valkey-io/valkey/issues
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37fce03da3..6be3d9b73e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,9 +19,9 @@ There is also an active community of Redis users at Stack Overflow:
 
     https://stackoverflow.com/questions/tagged/redis
 
-Issues and pull requests for documentation belong on the placeholderkv-doc repo:
+Issues and pull requests for documentation belong on the valkey-doc repo:
 
-    https://github.com/placeholderkv/placeholderkv-doc
+    https://github.com/valkey-io-doc
 
 If you are reporting a security bug or vulnerability, see SECURITY.md.
 
@@ -58,7 +58,7 @@ By making a contribution to this project, I certify that:
     involved.
  ```
 
-We require that every contribution to placeholderkv to be signed with a DCO. We require the usage of known identity (such as a real or preferred name). We do not accept anonymous contributors nor those utilizing pseudonyms. A DCO signed commit will contain a line like:
+We require that every contribution to Valkey to be signed with a DCO. We require the usage of known identity (such as a real or preferred name). We do not accept anonymous contributors nor those utilizing pseudonyms. A DCO signed commit will contain a line like:
 
 ```
 Signed-off-by: Jane Smith <jane.smith@email.com>
@@ -75,7 +75,7 @@ to accomplish and why. Use cases are important for features to be accepted.
 Here you can see if there is consensus about your idea.
 
 2. If in step 1 you get an acknowledgment from the project leaders, use the following procedure to submit a patch:
-    1. Fork placeholderkv on GitHub ( https://docs.github.com/en/github/getting-started-with-github/fork-a-repo )
+    1. Fork Valkey on GitHub ( https://docs.github.com/en/github/getting-started-with-github/fork-a-repo )
     1. Create a topic branch (git checkout -b my_branch)
     1. Make the needed changes and commit with a DCO. (git commit -s)
     1. Push to your branch (git push origin my_branch)
diff --git a/README.md b/README.md
index cd654fdf31..2ee7edc523 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,23 @@
 This README is under construction as we work to build a new community driven high performance key-value store.
 
-This project was forked from the open source Redis project right before the transition to their new source available licenses.
+This project was forked from the open source Redis project right before the transition to their new source available licenses. For now we intend to keep the 
 
 This README is just a fast *quick start* document. We are currently working on a more permanent documentation page.
 
-What is PlaceHolderKV?
+What is Valkey?
 --------------
-The name is temporary, as we work to find a new name that the community accepts. It also happens to be a very easy string to search for. 
+Valkey is a high-performance data structure server that primarily serves key/value workloads.
+It supports a wide range of native structures and an extensible plugin system for adding new data structures and access patterns.
 
-Building PlaceHolderKV
+Building Valkey
 --------------
 
-PlaceHolderKV can be compiled and used on Linux, OSX, OpenBSD, NetBSD, FreeBSD.
+Valkey can be compiled and used on Linux, OSX, OpenBSD, NetBSD, FreeBSD.
 We support big endian and little endian architectures, and both 32 bit
 and 64 bit systems.
 
 It may compile on Solaris derived systems (for instance SmartOS) but our
-support for this platform is *best effort* and PlaceHolderKV is not guaranteed to
+support for this platform is *best effort* and Valkey is not guaranteed to
 work as well as in Linux, OSX, and \*BSD.
 
 It is as simple as:
@@ -33,15 +34,15 @@ as libsystemd-dev on Debian/Ubuntu or systemd-devel on CentOS) and run:
 
     % make USE_SYSTEMD=yes
 
-To append a suffix to PlaceHolderKV program names, use:
+To append a suffix to Valkey program names, use:
 
     % make PROG_SUFFIX="-alt"
 
-You can build a 32 bit PlaceHolderKV binary using:
+You can build a 32 bit Valkey binary using:
 
     % make 32bit
 
-After building PlaceHolderKV, it is a good idea to test it using:
+After building Valkey, it is a good idea to test it using:
 
     % make test
 
@@ -55,7 +56,7 @@ installed):
 Fixing build problems with dependencies or cached build options
 ---------
 
-PlaceHolderKV has some dependencies which are included in the `deps` directory.
+Valkey has some dependencies which are included in the `deps` directory.
 `make` does not automatically rebuild dependencies even if something in
 the source code of dependencies changes.
 
@@ -65,7 +66,7 @@ command in order to really clean everything and rebuild from scratch:
 
     % make distclean
 
-This will clean: jemalloc, lua, hiplaceholderkv, linenoise and other dependencies.
+This will clean: jemalloc, lua, hiredis, linenoise and other dependencies.
 
 Also if you force certain build options like 32bit target, no C compiler
 optimizations (for debugging purposes), and other similar build time options,
@@ -75,11 +76,11 @@ command.
 Fixing problems building 32 bit binaries
 ---------
 
-If after building PlaceHolderKV with a 32 bit target you need to rebuild it
+If after building Valkey with a 32 bit target you need to rebuild it
 with a 64 bit target, or the other way around, you need to perform a
-`make distclean` in the root directory of the PlaceHolderKV distribution.
+`make distclean` in the root directory of the Valkey distribution.
 
-In case of build errors when trying to build a 32 bit binary of PlaceHolderKV, try
+In case of build errors when trying to build a 32 bit binary of Valkey, try
 the following steps:
 
 * Install the package libc6-dev-i386 (also try g++-multilib).
@@ -89,8 +90,8 @@ the following steps:
 Allocator
 ---------
 
-Selecting a non-default memory allocator when building PlaceHolderKV is done by setting
-the `MALLOC` environment variable. PlaceHolderKV is compiled and linked against libc
+Selecting a non-default memory allocator when building Valkey is done by setting
+the `MALLOC` environment variable. Valkey is compiled and linked against libc
 malloc by default, with the exception of jemalloc being the default on Linux
 systems. This default was picked because jemalloc has proven to have fewer
 fragmentation problems than libc malloc.
@@ -106,7 +107,7 @@ To compile against jemalloc on Mac OS X systems, use:
 Monotonic clock
 ---------------
 
-By default, PlaceHolderKV will build using the POSIX clock_gettime function as the
+By default, Valkey will build using the POSIX clock_gettime function as the
 monotonic clock source.  On most modern systems, the internal processor clock
 can be used to improve performance.  Cautions can be found here: 
     http://oliveryang.net/2015/09/pitfalls-of-TSC-usage/
@@ -118,64 +119,64 @@ To build with support for the processor's internal instruction clock, use:
 Verbose build
 -------------
 
-PlaceHolderKV will build with a user-friendly colorized output by default.
+Valkey will build with a user-friendly colorized output by default.
 If you want to see a more verbose output, use the following:
 
     % make V=1
 
-Running PlaceHolderKV
+Running Valkey
 -------------
 
-To run PlaceHolderKV with the default configuration, just type:
+To run valkey with the default configuration, just type:
 
     % cd src
-    % ./placeholderkv-server
+    % ./valkey-server
 
-If you want to provide your placeholderkv.conf, you have to run it using an additional
+If you want to provide your valkey.conf, you have to run it using an additional
 parameter (the path of the configuration file):
 
     % cd src
-    % ./placeholderkv-server /path/to/placeholderkv.conf
+    % ./valkey-server /path/to/valkey.conf
 
-It is possible to alter the PlaceHolderKV configuration by passing parameters directly
+It is possible to alter the valkey configuration by passing parameters directly
 as options using the command line. Examples:
 
-    % ./placeholderkv-server --port 9999 --replicaof 127.0.0.1 6379
-    % ./placeholderkv-server /etc/placeholderkv/6379.conf --loglevel debug
+    % ./valkey-server --port 9999 --replicaof 127.0.0.1 6379
+    % ./valkey-server /etc/valkey/6379.conf --loglevel debug
 
-All the options in placeholderkv.conf are also supported as options using the command
+All the options in valkey.conf are also supported as options using the command
 line, with exactly the same name.
 
-Running PlaceHolderKV with TLS:
+Running valkey with TLS:
 ------------------
 
 Please consult the [TLS.md](TLS.md) file for more information on
-how to use PlaceHolderKV with TLS.
+how to use valkey with TLS.
 
-Playing with PlaceHolderKV
+Playing with valkey
 ------------------
 
-You can use placeholderkv-cli to play with PlaceHolderKV. Start a placeholderkv-server instance,
+You can use Valkey-cli to play with Valkey. Start a Valkey-server instance,
 then in another terminal try the following:
 
     % cd src
-    % ./placeholderkv-cli
-    placeholderkv> ping
+    % ./valkey-cli
+    valkey> ping
     PONG
-    placeholderkv> set foo bar
+    valkey> set foo bar
     OK
-    placeholderkv> get foo
+    valkey> get foo
     "bar"
-    placeholderkv> incr mycounter
+    valkey> incr mycounter
     (integer) 1
-    placeholderkv> incr mycounter
+    valkey> incr mycounter
     (integer) 2
-    placeholderkv>
+    valkey>
 
-Installing PlaceHolderKV
+Installing Valkey
 -----------------
 
-In order to install PlaceHolderKV binaries into /usr/local/bin, just use:
+In order to install Valkey binaries into /usr/local/bin, just use:
 
     % make install
 
@@ -184,7 +185,7 @@ different destination.
 
 `make install` will just install binaries in your system, but will not configure
 init scripts and configuration files in the appropriate place. This is not
-needed if you just want to play a bit with PlaceHolderKV, but if you are installing
+needed if you just want to play a bit with Valkey, but if you are installing
 it the proper way for a production system, we have a script that does this
 for Ubuntu and Debian systems:
 
@@ -194,24 +195,16 @@ for Ubuntu and Debian systems:
 _Note_: `install_server.sh` will not work on Mac OSX; it is built for Linux only.
 
 The script will ask you a few questions and will setup everything you need
-to run PlaceHolderKV properly as a background daemon that will start again on
+to run Valkey properly as a background daemon that will start again on
 system reboots.
 
-You'll be able to stop and start PlaceHolderKV using the script named
-`/etc/init.d/placeholderkv_<portnumber>`, for instance `/etc/init.d/placeholderkv_6379`.
+You'll be able to stop and start Valkey using the script named
+`/etc/init.d/valkey_<portnumber>`, for instance `/etc/init.d/valkey_6379`.
 
 Code contributions
 -----------------
+Please see the [CONTRIBUTING.md][2]. For security bugs and vulnerabilities, please see [SECURITY.md][3].
 
-Note: By contributing code to the PlaceHolderKV project in any form, including sending
-a pull request via Github, a code fragment or patch via private email or
-public discussion groups, you agree to release your code under the terms
-of the BSD license that you can find in the [COPYING][1] file included in the PlaceHolderKV
-source distribution.
-
-Please see the [CONTRIBUTING.md][2] file in this source distribution for more
-information. For security bugs and vulnerabilities, please see [SECURITY.md][3].
-
-[1]: https://github.com/madolson/placeholderkv/blob/unstable/COPYING
-[2]: https://github.com/madolson/placeholderkv/blob/unstable/CONTRIBUTING.md
-[3]: https://github.com/madolson/placeholderkv/blob/unstable/SECURITY.md
+[1]: https://github.com/valkey-io/valkey/blob/unstable/COPYING
+[2]: https://github.com/valkey-io/valkey/blob/unstable/CONTRIBUTING.md
+[3]: https://github.com/valkey-io/valkey/blob/unstable/SECURITY.md
diff --git a/src/Makefile b/src/Makefile
index 5747e1ae8a..f762e2912c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -349,7 +349,7 @@ else
 	GEN_COMMANDS_FLAGS=
 endif
 
-ENGINE_NAME=placeholderkv
+ENGINE_NAME=valkey
 SERVER_NAME=$(ENGINE_NAME)-server$(PROG_SUFFIX)
 ENGINE_SENTINEL_NAME=$(ENGINE_NAME)-sentinel$(PROG_SUFFIX)
 ENGINE_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
diff --git a/src/server.c b/src/server.c
index 3050859d62..221ab00365 100644
--- a/src/server.c
+++ b/src/server.c
@@ -6612,9 +6612,9 @@ void dismissMemoryInChild(void) {
 void memtest(size_t megabytes, int passes);
 
 /* Returns 1 if there is --sentinel among the arguments or if
- * executable name contains "placeholderkv-sentinel". */
+ * executable name contains "valkey-sentinel". */
 int checkForSentinelMode(int argc, char **argv, char *exec_name) {
-    if (strstr(exec_name,"placeholderkv-sentinel") != NULL) return 1;
+    if (strstr(exec_name,"valkey-sentinel") != NULL) return 1;
 
     for (int j = 1; j < argc; j++)
         if (!strcmp(argv[j],"--sentinel")) return 1;
@@ -6995,9 +6995,9 @@ int main(int argc, char **argv) {
     /* Check if we need to start in redis-check-rdb/aof mode. We just execute
      * the program main. However the program is part of the Redis executable
      * so that we can easily execute an RDB check on loading errors. */
-    if (strstr(exec_name,"placeholderkv-check-rdb") != NULL)
+    if (strstr(exec_name,"valkey-check-rdb") != NULL)
         redis_check_rdb_main(argc,argv,NULL);
-    else if (strstr(exec_name,"placeholderkv-check-aof") != NULL)
+    else if (strstr(exec_name,"valkey-check-aof") != NULL)
         redis_check_aof_main(argc,argv);
 
     if (argc >= 2) {
diff --git a/tests/cluster/tests/04-resharding.tcl b/tests/cluster/tests/04-resharding.tcl
index 3a08c70802..f7cb7e4988 100644
--- a/tests/cluster/tests/04-resharding.tcl
+++ b/tests/cluster/tests/04-resharding.tcl
@@ -84,7 +84,7 @@ test "Cluster consistency during live resharding" {
             flush stdout
             set target [dict get [get_myself [randomInt 5]] id]
             set tribpid [lindex [exec \
-                ../../../src/placeholderkv-cli --cluster reshard \
+                ../../../src/valkey-cli --cluster reshard \
                 127.0.0.1:[get_instance_attrib redis 0 port] \
                 --cluster-from all \
                 --cluster-to $target \
diff --git a/tests/cluster/tests/12-replica-migration-2.tcl b/tests/cluster/tests/12-replica-migration-2.tcl
index b41edf9c83..5c3edeb8e5 100644
--- a/tests/cluster/tests/12-replica-migration-2.tcl
+++ b/tests/cluster/tests/12-replica-migration-2.tcl
@@ -38,7 +38,7 @@ test "Set allow-replica-migration yes" {
 set master0_id [dict get [get_myself 0] id]
 test "Resharding all the master #0 slots away from it" {
     set output [exec \
-        ../../../src/placeholderkv-cli --cluster rebalance \
+        ../../../src/valkey-cli --cluster rebalance \
         127.0.0.1:[get_instance_attrib redis 0 port] \
         {*}[rediscli_tls_config "../../../tests"] \
         --cluster-weight ${master0_id}=0 >@ stdout ]
@@ -59,7 +59,7 @@ test "Resharding back some slot to master #0" {
     # new resharding.
     after 10000
     set output [exec \
-        ../../../src/placeholderkv-cli --cluster rebalance \
+        ../../../src/valkey-cli --cluster rebalance \
         127.0.0.1:[get_instance_attrib redis 0 port] \
         {*}[rediscli_tls_config "../../../tests"] \
         --cluster-weight ${master0_id}=.01 \
diff --git a/tests/cluster/tests/12.1-replica-migration-3.tcl b/tests/cluster/tests/12.1-replica-migration-3.tcl
index 9015062e8a..3515425e14 100644
--- a/tests/cluster/tests/12.1-replica-migration-3.tcl
+++ b/tests/cluster/tests/12.1-replica-migration-3.tcl
@@ -37,7 +37,7 @@ test "Set allow-replica-migration no" {
 set master0_id [dict get [get_myself 0] id]
 test "Resharding all the master #0 slots away from it" {
     set output [exec \
-        ../../../src/placeholderkv-cli --cluster rebalance \
+        ../../../src/valkey-cli --cluster rebalance \
         127.0.0.1:[get_instance_attrib redis 0 port] \
         {*}[rediscli_tls_config "../../../tests"] \
         --cluster-weight ${master0_id}=0 >@ stdout ]
diff --git a/tests/cluster/tests/includes/utils.tcl b/tests/cluster/tests/includes/utils.tcl
index ee71a4747c..f0c6d94b3c 100644
--- a/tests/cluster/tests/includes/utils.tcl
+++ b/tests/cluster/tests/includes/utils.tcl
@@ -8,7 +8,7 @@ proc config_set_all_nodes {keyword value} {
 
 proc fix_cluster {addr} {
     set code [catch {
-        exec ../../../src/placeholderkv-cli {*}[rediscli_tls_config "../../../tests"] --cluster fix $addr << yes
+        exec ../../../src/valkey-cli {*}[rediscli_tls_config "../../../tests"] --cluster fix $addr << yes
     } result]
     if {$code != 0} {
         puts "redis-cli --cluster fix returns non-zero exit code, output below:\n$result"
@@ -17,7 +17,7 @@ proc fix_cluster {addr} {
     # but we can ignore that and rely on the check below.
     assert_cluster_state ok
     wait_for_condition 100 100 {
-        [catch {exec ../../../src/placeholderkv-cli {*}[rediscli_tls_config "../../../tests"] --cluster check $addr} result] == 0
+        [catch {exec ../../../src/valkey-cli {*}[rediscli_tls_config "../../../tests"] --cluster check $addr} result] == 0
     } else {
         puts "redis-cli --cluster check returns non-zero exit code, output below:\n$result"
         fail "Cluster could not settle with configuration"
@@ -26,7 +26,7 @@ proc fix_cluster {addr} {
 
 proc wait_cluster_stable {} {
     wait_for_condition 1000 50 {
-        [catch {exec ../../../src/placeholderkv-cli --cluster \
+        [catch {exec ../../../src/valkey-cli --cluster \
             check 127.0.0.1:[get_instance_attrib redis 0 port] \
             {*}[rediscli_tls_config "../../../tests"] \
             }] == 0
diff --git a/tests/instances.tcl b/tests/instances.tcl
index 5daf69a26e..d4ecfbfd84 100644
--- a/tests/instances.tcl
+++ b/tests/instances.tcl
@@ -48,9 +48,9 @@ if {[catch {cd tmp}]} {
 # the provided configuration file. Returns the PID of the process.
 proc exec_instance {type dirname cfgfile} {
     if {$type eq "redis"} {
-        set prgname placeholderkv-server
+        set prgname valkey-server
     } elseif {$type eq "sentinel"} {
-        set prgname placeholderkv-sentinel
+        set prgname valkey-sentinel
     } else {
         error "Unknown instance type."
     }
diff --git a/tests/integration/aof-race.tcl b/tests/integration/aof-race.tcl
index 1220472c40..26e728afb6 100644
--- a/tests/integration/aof-race.tcl
+++ b/tests/integration/aof-race.tcl
@@ -8,7 +8,7 @@ tags {"aof external:skip"} {
     # was subsequently appended to the new AOF, resulting in duplicate commands.
     start_server_aof [list dir $server_path] {
         set client [redis [srv host] [srv port] 0 $::tls]
-        set bench [open "|src/placeholderkv-benchmark -q -s [srv unixsocket] -c 20 -n 20000 incr foo" "r+"]
+        set bench [open "|src/valkey-benchmark -q -s [srv unixsocket] -c 20 -n 20000 incr foo" "r+"]
 
         wait_for_condition 100 1 {
             [$client get foo] > 0
diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl
index e22923403c..31afee7268 100644
--- a/tests/integration/aof.tcl
+++ b/tests/integration/aof.tcl
@@ -107,7 +107,7 @@ tags {"aof external:skip"} {
     ## Test that redis-check-aof indeed sees this AOF is not valid
     test "Short read: Utility should confirm the AOF is not valid" {
         catch {
-            exec src/placeholderkv-check-aof $aof_manifest_file
+            exec src/valkey-check-aof $aof_manifest_file
         } result
         assert_match "*not valid*" $result
     }
@@ -119,13 +119,13 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_manifest_file
+            exec src/valkey-check-aof $aof_manifest_file
         } result
         assert_match "*ok_up_to_line=8*" $result
     }
 
     test "Short read: Utility should be able to fix the AOF" {
-        set result [exec src/placeholderkv-check-aof --fix $aof_manifest_file << "y\n"]
+        set result [exec src/valkey-check-aof --fix $aof_manifest_file << "y\n"]
         assert_match "*Successfully truncated AOF*" $result
     }
 
@@ -397,7 +397,7 @@ tags {"aof external:skip"} {
 
     test {Truncate AOF to specific timestamp} {
         # truncate to timestamp 1628217473
-        exec src/placeholderkv-check-aof --truncate-to-timestamp 1628217473 $aof_manifest_file
+        exec src/valkey-check-aof --truncate-to-timestamp 1628217473 $aof_manifest_file
         start_server_aof [list dir $server_path] {
             set c [redis [srv host] [srv port] 0 $::tls]
             wait_done_loading $c
@@ -407,7 +407,7 @@ tags {"aof external:skip"} {
         }
 
         # truncate to timestamp 1628217471
-        exec src/placeholderkv-check-aof --truncate-to-timestamp 1628217471 $aof_manifest_file
+        exec src/valkey-check-aof --truncate-to-timestamp 1628217471 $aof_manifest_file
         start_server_aof [list dir $server_path] {
             set c [redis [srv host] [srv port] 0 $::tls]
             wait_done_loading $c
@@ -417,7 +417,7 @@ tags {"aof external:skip"} {
         }
 
         # truncate to timestamp 1628217470
-        exec src/placeholderkv-check-aof --truncate-to-timestamp 1628217470 $aof_manifest_file
+        exec src/valkey-check-aof --truncate-to-timestamp 1628217470 $aof_manifest_file
         start_server_aof [list dir $server_path] {
             set c [redis [srv host] [srv port] 0 $::tls]
             wait_done_loading $c
@@ -426,7 +426,7 @@ tags {"aof external:skip"} {
         }
 
         # truncate to timestamp 1628217469
-        catch {exec src/placeholderkv-check-aof --truncate-to-timestamp 1628217469 $aof_manifest_file} e
+        catch {exec src/valkey-check-aof --truncate-to-timestamp 1628217469 $aof_manifest_file} e
         assert_match {*aborting*} $e
     }
 
@@ -476,7 +476,7 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_file
+            exec src/valkey-check-aof $aof_file
         } result
         assert_match "*Start checking Old-Style AOF*is valid*" $result
     }
@@ -488,14 +488,14 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_file
+            exec src/valkey-check-aof $aof_file
         } result
         assert_match "*Start checking Old-Style AOF*is valid*" $result
     }
 
     test {Test redis-check-aof for old style rdb-preamble AOF} {
         catch {
-            exec src/placeholderkv-check-aof tests/assets/rdb-preamble.aof
+            exec src/valkey-check-aof tests/assets/rdb-preamble.aof
         } result
         assert_match "*Start checking Old-Style AOF*RDB preamble is OK, proceeding with AOF tail*is valid*" $result
     }
@@ -517,7 +517,7 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_manifest_file
+            exec src/valkey-check-aof $aof_manifest_file
         } result
         assert_match "*Start checking Multi Part AOF*Start to check BASE AOF (RESP format)*BASE AOF*is valid*Start to check INCR files*INCR AOF*is valid*All AOF files and manifest are valid*" $result
     }
@@ -536,7 +536,7 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_manifest_file
+            exec src/valkey-check-aof $aof_manifest_file
         } result
         assert_match "*Start checking Multi Part AOF*Start to check BASE AOF (RDB format)*DB preamble is OK, proceeding with AOF tail*BASE AOF*is valid*Start to check INCR files*INCR AOF*is valid*All AOF files and manifest are valid*" $result
     }
@@ -549,7 +549,7 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_manifest_file
+            exec src/valkey-check-aof $aof_manifest_file
         } result
         assert_match "*Invalid AOF manifest file format*" $result
     }
@@ -572,12 +572,12 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof $aof_manifest_file
+            exec src/valkey-check-aof $aof_manifest_file
         } result
         assert_match "*not valid*" $result
 
         catch {
-            exec src/placeholderkv-check-aof --fix $aof_manifest_file
+            exec src/valkey-check-aof --fix $aof_manifest_file
         } result
         assert_match "*Failed to truncate AOF*because it is not the last file*" $result
     }
@@ -605,7 +605,7 @@ tags {"aof external:skip"} {
         }
 
         catch {
-            exec src/placeholderkv-check-aof --truncate-to-timestamp 1628217473 $aof_manifest_file
+            exec src/valkey-check-aof --truncate-to-timestamp 1628217473 $aof_manifest_file
         } result
         assert_match "*Failed to truncate AOF*to timestamp*because it is not the last file*" $result
     }
diff --git a/tests/integration/psync2-reg.tcl b/tests/integration/psync2-reg.tcl
index 8317f1e365..a803d82a8a 100644
--- a/tests/integration/psync2-reg.tcl
+++ b/tests/integration/psync2-reg.tcl
@@ -40,7 +40,7 @@ start_server {} {
     }
 
     set cycle_start_time [clock milliseconds]
-    set bench_pid [exec src/placeholderkv-benchmark -s $R_unixsocket(0) -n 10000000 -r 1000 incr __rand_int__ > /dev/null &]
+    set bench_pid [exec src/valkey-benchmark -s $R_unixsocket(0) -n 10000000 -r 1000 incr __rand_int__ > /dev/null &]
     while 1 {
         set elapsed [expr {[clock milliseconds]-$cycle_start_time}]
         if {$elapsed > $duration*1000} break
diff --git a/tests/support/benchmark.tcl b/tests/support/benchmark.tcl
index 3d49ee16f8..35a8d26232 100644
--- a/tests/support/benchmark.tcl
+++ b/tests/support/benchmark.tcl
@@ -12,21 +12,21 @@ proc redisbenchmark_tls_config {testsdir} {
 }
 
 proc redisbenchmark {host port {opts {}}} {
-    set cmd [list src/placeholderkv-benchmark -h $host -p $port]
+    set cmd [list src/valkey-benchmark -h $host -p $port]
     lappend cmd {*}[redisbenchmark_tls_config "tests"]
     lappend cmd {*}$opts
     return $cmd
 }
 
 proc redisbenchmarkuri {host port {opts {}}} {
-    set cmd [list src/placeholderkv-benchmark -u redis://$host:$port]
+    set cmd [list src/valkey-benchmark -u redis://$host:$port]
     lappend cmd {*}[redisbenchmark_tls_config "tests"]
     lappend cmd {*}$opts
     return $cmd
 }
 
 proc redisbenchmarkuriuserpass {host port user pass {opts {}}} {
-    set cmd [list src/placeholderkv-benchmark -u redis://$user:$pass@$host:$port]
+    set cmd [list src/valkey-benchmark -u redis://$user:$pass@$host:$port]
     lappend cmd {*}[redisbenchmark_tls_config "tests"]
     lappend cmd {*}$opts
     return $cmd
diff --git a/tests/support/cli.tcl b/tests/support/cli.tcl
index a83ad43187..4bd693369b 100644
--- a/tests/support/cli.tcl
+++ b/tests/support/cli.tcl
@@ -13,7 +13,7 @@ proc rediscli_tls_config {testsdir} {
 
 # Returns command line for executing redis-cli
 proc rediscli {host port {opts {}}} {
-    set cmd [list src/placeholderkv-cli -h $host -p $port]
+    set cmd [list src/valkey-cli -h $host -p $port]
     lappend cmd {*}[rediscli_tls_config "tests"]
     lappend cmd {*}$opts
     return $cmd
@@ -21,7 +21,7 @@ proc rediscli {host port {opts {}}} {
 
 # Returns command line for executing redis-cli with a unix socket address
 proc rediscli_unixsocket {unixsocket {opts {}}} {
-    return [list src/placeholderkv-cli -s $unixsocket {*}$opts]
+    return [list src/valkey-cli -s $unixsocket {*}$opts]
 }
 
 # Run redis-cli with specified args on the server of specified level.
diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index ae8c83ea81..43f619b251 100644
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -275,7 +275,7 @@ proc create_server_config_file {filename config config_lines} {
 }
 
 proc spawn_server {config_file stdout stderr args} {
-    set cmd [list src/placeholderkv-server $config_file]
+    set cmd [list src/valkey-server $config_file]
     set args {*}$args
     if {[llength $args] > 0} {
         lappend cmd {*}$args
diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index ecb86fc78b..00d94ff338 100644
--- a/tests/support/util.tcl
+++ b/tests/support/util.tcl
@@ -1143,7 +1143,7 @@ proc system_backtrace_supported {} {
     # libmusl does not support backtrace. Also return 0 on
     # static binaries (ldd exit code 1) where we can't detect libmusl
     catch {
-        set ldd [exec ldd src/placeholderkv-server]
+        set ldd [exec ldd src/valkey-server]
         if {![string match {*libc.*musl*} $ldd]} {
             return 1
         }
diff --git a/tests/unit/acl.tcl b/tests/unit/acl.tcl
index 60e409f474..95b8a376ef 100644
--- a/tests/unit/acl.tcl
+++ b/tests/unit/acl.tcl
@@ -1227,10 +1227,10 @@ start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"] tags
     }
     
     test {Test loading duplicate users in config on startup} {
-        catch {exec src/placeholderkv-server --user foo --user foo} err
+        catch {exec src/valkey-server --user foo --user foo} err
         assert_match {*Duplicate user*} $err
 
-        catch {exec src/placeholderkv-server --user default --user default} err
+        catch {exec src/valkey-server --user default --user default} err
         assert_match {*Duplicate user*} $err
     } {} {external:skip}
 }
diff --git a/tests/unit/cluster/cli.tcl b/tests/unit/cluster/cli.tcl
index e96b3bcef0..136984da88 100644
--- a/tests/unit/cluster/cli.tcl
+++ b/tests/unit/cluster/cli.tcl
@@ -20,7 +20,7 @@ start_multiple_servers 3 [list overrides $base_conf] {
     set node3_rd [redis_deferring_client -2]
 
     test {Create 3 node cluster} {
-        exec src/placeholderkv-cli --cluster-yes --cluster create \
+        exec src/valkey-cli --cluster-yes --cluster create \
                            127.0.0.1:[srv 0 port] \
                            127.0.0.1:[srv -1 port] \
                            127.0.0.1:[srv -2 port]
@@ -47,7 +47,7 @@ start_multiple_servers 3 [list overrides $base_conf] {
     }
 
     test "Perform a Resharding" {
-        exec src/placeholderkv-cli --cluster-yes --cluster reshard 127.0.0.1:[srv -2 port] \
+        exec src/valkey-cli --cluster-yes --cluster reshard 127.0.0.1:[srv -2 port] \
                            --cluster-to [$node1 cluster myid] \
                            --cluster-from [$node3 cluster myid] \
                            --cluster-slots 1
@@ -68,9 +68,9 @@ start_multiple_servers 3 [list overrides $base_conf] {
         # waiting for cluster_state to be okay is an independent check that all the
         # nodes actually believe each other are healthy, prevent cluster down error.
         wait_for_condition 1000 50 {
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv 0 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -1 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -2 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv 0 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -1 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -2 port]}] == 0 &&
             [CI 0 cluster_state] eq {ok} &&
             [CI 1 cluster_state] eq {ok} &&
             [CI 2 cluster_state] eq {ok}
@@ -92,8 +92,8 @@ start_multiple_servers 3 [list overrides $base_conf] {
         assert_error "*MOVED $slot_for_foo :*" {$node1 set foo bar}
 
         # when in cluster mode, redirect using previous hostip
-        assert_equal "[exec src/placeholderkv-cli -h 127.0.0.1 -p [srv 0 port] -c set foo bar]" {OK}
-        assert_match "[exec src/placeholderkv-cli -h 127.0.0.1 -p [srv 0 port] -c get foo]" {bar}
+        assert_equal "[exec src/valkey-cli -h 127.0.0.1 -p [srv 0 port] -c set foo bar]" {OK}
+        assert_match "[exec src/valkey-cli -h 127.0.0.1 -p [srv 0 port] -c get foo]" {bar}
 
         assert_equal [$node1 CONFIG SET cluster-preferred-endpoint-type "$endpoint_type_before_set"]  {OK}
     }
@@ -164,7 +164,7 @@ start_multiple_servers 5 [list overrides $base_conf] {
     set node5_rd [redis_client -4]
 
     test {Functions are added to new node on redis-cli cluster add-node} {
-        exec src/placeholderkv-cli --cluster-yes --cluster create \
+        exec src/valkey-cli --cluster-yes --cluster create \
                            127.0.0.1:[srv 0 port] \
                            127.0.0.1:[srv -1 port] \
                            127.0.0.1:[srv -2 port]
@@ -179,13 +179,13 @@ start_multiple_servers 5 [list overrides $base_conf] {
         }
 
         # upload a function to all the cluster
-        exec src/placeholderkv-cli --cluster-yes --cluster call 127.0.0.1:[srv 0 port] \
+        exec src/valkey-cli --cluster-yes --cluster call 127.0.0.1:[srv 0 port] \
                            FUNCTION LOAD {#!lua name=TEST
                                redis.register_function('test', function() return 'hello' end)
                            }
 
         # adding node to the cluster
-        exec src/placeholderkv-cli --cluster-yes --cluster add-node \
+        exec src/valkey-cli --cluster-yes --cluster add-node \
                        127.0.0.1:[srv -3 port] \
                        127.0.0.1:[srv 0 port]
 
@@ -213,7 +213,7 @@ start_multiple_servers 5 [list overrides $base_conf] {
 
         # adding node 5 to the cluster should failed because it already contains the 'test' function
         catch {
-            exec src/placeholderkv-cli --cluster-yes --cluster add-node \
+            exec src/valkey-cli --cluster-yes --cluster add-node \
                         127.0.0.1:[srv -4 port] \
                         127.0.0.1:[srv 0 port]
         } e
@@ -227,7 +227,7 @@ test {Migrate the last slot away from a node using redis-cli} {
     start_multiple_servers 4 [list overrides $base_conf] {
 
         # Create a cluster of 3 nodes
-        exec src/placeholderkv-cli --cluster-yes --cluster create \
+        exec src/valkey-cli --cluster-yes --cluster create \
                            127.0.0.1:[srv 0 port] \
                            127.0.0.1:[srv -1 port] \
                            127.0.0.1:[srv -2 port]
@@ -241,11 +241,11 @@ test {Migrate the last slot away from a node using redis-cli} {
         }
 
         # Insert some data
-        assert_equal OK [exec src/placeholderkv-cli -c -p [srv 0 port] SET foo bar]
-        set slot [exec src/placeholderkv-cli -c -p [srv 0 port] CLUSTER KEYSLOT foo]
+        assert_equal OK [exec src/valkey-cli -c -p [srv 0 port] SET foo bar]
+        set slot [exec src/valkey-cli -c -p [srv 0 port] CLUSTER KEYSLOT foo]
 
         # Add new node to the cluster
-        exec src/placeholderkv-cli --cluster-yes --cluster add-node \
+        exec src/valkey-cli --cluster-yes --cluster add-node \
                      127.0.0.1:[srv -3 port] \
                      127.0.0.1:[srv 0 port]
         
@@ -283,10 +283,10 @@ test {Migrate the last slot away from a node using redis-cli} {
         # Using --cluster check make sure we won't get `Not all slots are covered by nodes`.
         # Wait for the cluster to become stable make sure the cluster is up during MIGRATE.
         wait_for_condition 1000 50 {
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv 0 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -1 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -2 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -3 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv 0 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -1 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -2 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -3 port]}] == 0 &&
             [CI 0 cluster_state] eq {ok} &&
             [CI 1 cluster_state] eq {ok} &&
             [CI 2 cluster_state] eq {ok} &&
@@ -296,7 +296,7 @@ test {Migrate the last slot away from a node using redis-cli} {
         }
 
         # Move the only slot back to original node using redis-cli
-        exec src/placeholderkv-cli --cluster reshard 127.0.0.1:[srv -3 port] \
+        exec src/valkey-cli --cluster reshard 127.0.0.1:[srv -3 port] \
             --cluster-from $newnode_id \
             --cluster-to $owner_id \
             --cluster-slots 1 \
@@ -341,7 +341,7 @@ start_server [list overrides [list cluster-enabled yes cluster-node-timeout 1 cl
     # The last two are used to test --cluster add-node
 
     test "redis-cli -4 --cluster create using $ip_or_localhost with cluster-port" {
-        exec src/placeholderkv-cli -4 --cluster-yes --cluster create \
+        exec src/valkey-cli -4 --cluster-yes --cluster create \
                            $ip_or_localhost:[srv 0 port] \
                            $ip_or_localhost:[srv -1 port] \
                            $ip_or_localhost:[srv -2 port]
@@ -362,7 +362,7 @@ start_server [list overrides [list cluster-enabled yes cluster-node-timeout 1 cl
 
     test "redis-cli -4 --cluster add-node using $ip_or_localhost with cluster-port" {
         # Adding node to the cluster (without cluster-port)
-        exec src/placeholderkv-cli -4 --cluster-yes --cluster add-node \
+        exec src/valkey-cli -4 --cluster-yes --cluster add-node \
                            $ip_or_localhost:[srv -3 port] \
                            $ip_or_localhost:[srv 0 port]
 
@@ -378,7 +378,7 @@ start_server [list overrides [list cluster-enabled yes cluster-node-timeout 1 cl
         }
 
         # Adding node to the cluster (with cluster-port)
-        exec src/placeholderkv-cli -4 --cluster-yes --cluster add-node \
+        exec src/valkey-cli -4 --cluster-yes --cluster add-node \
                            $ip_or_localhost:[srv -4 port] \
                            $ip_or_localhost:[srv 0 port]
 
diff --git a/tests/unit/introspection.tcl b/tests/unit/introspection.tcl
index 391a1f6453..8e077992f3 100644
--- a/tests/unit/introspection.tcl
+++ b/tests/unit/introspection.tcl
@@ -708,44 +708,44 @@ start_server {tags {"introspection"}} {
 
     test {redis-server command line arguments - error cases} {
         # Take '--invalid' as the option.
-        catch {exec src/placeholderkv-server --invalid} err
+        catch {exec src/valkey-server --invalid} err
         assert_match {*Bad directive or wrong number of arguments*} $err
 
-        catch {exec src/placeholderkv-server --port} err
+        catch {exec src/valkey-server --port} err
         assert_match {*'port'*wrong number of arguments*} $err
 
-        catch {exec src/placeholderkv-server --port 6380 --loglevel} err
+        catch {exec src/valkey-server --port 6380 --loglevel} err
         assert_match {*'loglevel'*wrong number of arguments*} $err
 
         # Take `6379` and `6380` as the port option value.
-        catch {exec src/placeholderkv-server --port 6379 6380} err
+        catch {exec src/valkey-server --port 6379 6380} err
         assert_match {*'port "6379" "6380"'*wrong number of arguments*} $err
 
         # Take `--loglevel` and `verbose` as the port option value.
-        catch {exec src/placeholderkv-server --port --loglevel verbose} err
+        catch {exec src/valkey-server --port --loglevel verbose} err
         assert_match {*'port "--loglevel" "verbose"'*wrong number of arguments*} $err
 
         # Take `--bla` as the port option value.
-        catch {exec src/placeholderkv-server --port --bla --loglevel verbose} err
+        catch {exec src/valkey-server --port --bla --loglevel verbose} err
         assert_match {*'port "--bla"'*argument couldn't be parsed into an integer*} $err
 
         # Take `--bla` as the loglevel option value.
-        catch {exec src/placeholderkv-server --logfile --my--log--file --loglevel --bla} err
+        catch {exec src/valkey-server --logfile --my--log--file --loglevel --bla} err
         assert_match {*'loglevel "--bla"'*argument(s) must be one of the following*} $err
 
         # Using MULTI_ARG's own check, empty option value
-        catch {exec src/placeholderkv-server --shutdown-on-sigint} err
+        catch {exec src/valkey-server --shutdown-on-sigint} err
         assert_match {*'shutdown-on-sigint'*argument(s) must be one of the following*} $err
-        catch {exec src/placeholderkv-server --shutdown-on-sigint "now force" --shutdown-on-sigterm} err
+        catch {exec src/valkey-server --shutdown-on-sigint "now force" --shutdown-on-sigterm} err
         assert_match {*'shutdown-on-sigterm'*argument(s) must be one of the following*} $err
 
         # Something like `redis-server --some-config --config-value1 --config-value2 --loglevel debug` would break,
         # because if you want to pass a value to a config starting with `--`, it can only be a single value.
-        catch {exec src/placeholderkv-server --replicaof 127.0.0.1 abc} err
+        catch {exec src/valkey-server --replicaof 127.0.0.1 abc} err
         assert_match {*'replicaof "127.0.0.1" "abc"'*Invalid master port*} $err
-        catch {exec src/placeholderkv-server --replicaof --127.0.0.1 abc} err
+        catch {exec src/valkey-server --replicaof --127.0.0.1 abc} err
         assert_match {*'replicaof "--127.0.0.1" "abc"'*Invalid master port*} $err
-        catch {exec src/placeholderkv-server --replicaof --127.0.0.1 --abc} err
+        catch {exec src/valkey-server --replicaof --127.0.0.1 --abc} err
         assert_match {*'replicaof "--127.0.0.1"'*wrong number of arguments*} $err
     } {} {external:skip}
 
diff --git a/tests/unit/moduleapi/cluster.tcl b/tests/unit/moduleapi/cluster.tcl
index 1d1b2df799..4c0a49d48d 100644
--- a/tests/unit/moduleapi/cluster.tcl
+++ b/tests/unit/moduleapi/cluster.tcl
@@ -43,7 +43,7 @@ start_cluster 3 0 [list config_lines $modules] {
 
 
     test "Perform a Resharding" {
-        exec src/placeholderkv-cli --cluster-yes --cluster reshard 127.0.0.1:[srv -2 port] \
+        exec src/valkey-cli --cluster-yes --cluster reshard 127.0.0.1:[srv -2 port] \
                            --cluster-to [$node1 cluster myid] \
                            --cluster-from [$node3 cluster myid] \
                            --cluster-slots 1
@@ -69,9 +69,9 @@ start_cluster 3 0 [list config_lines $modules] {
 
     test "Wait for cluster to be stable" {
         wait_for_condition 1000 50 {
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv 0 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -1 port]}] == 0 &&
-            [catch {exec src/placeholderkv-cli --cluster check 127.0.0.1:[srv -2 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv 0 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -1 port]}] == 0 &&
+            [catch {exec src/valkey-cli --cluster check 127.0.0.1:[srv -2 port]}] == 0 &&
             [CI 0 cluster_state] eq {ok} &&
             [CI 1 cluster_state] eq {ok} &&
             [CI 2 cluster_state] eq {ok}
diff --git a/tests/unit/moduleapi/moduleconfigs.tcl b/tests/unit/moduleapi/moduleconfigs.tcl
index 56dc5e9033..44f994d2d0 100644
--- a/tests/unit/moduleapi/moduleconfigs.tcl
+++ b/tests/unit/moduleapi/moduleconfigs.tcl
@@ -221,15 +221,15 @@ start_server {tags {"modules"}} {
     }
     test {startup moduleconfigs} {
         # No loadmodule directive
-        catch {exec src/placeholderkv-server --moduleconfigs.string "hello"} err
+        catch {exec src/valkey-server --moduleconfigs.string "hello"} err
         assert_match {*Module Configuration detected without loadmodule directive or no ApplyConfig call: aborting*} $err
 
         # Bad config value
-        catch {exec src/placeholderkv-server --loadmodule "$testmodule" --moduleconfigs.string "rejectisfreed"} err
+        catch {exec src/valkey-server --loadmodule "$testmodule" --moduleconfigs.string "rejectisfreed"} err
         assert_match {*Issue during loading of configuration moduleconfigs.string : Cannot set string to 'rejectisfreed'*} $err
 
         # missing LoadConfigs call
-        catch {exec src/placeholderkv-server --loadmodule "$testmodule" noload --moduleconfigs.string "hello"} err
+        catch {exec src/valkey-server --loadmodule "$testmodule" noload --moduleconfigs.string "hello"} err
         assert_match {*Module Configurations were not set, likely a missing LoadConfigs call. Unloading the module.*} $err
 
         # successful
diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl
index 8658071548..b364fc74a7 100644
--- a/tests/unit/other.tcl
+++ b/tests/unit/other.tcl
@@ -403,7 +403,7 @@ start_server {tags {"other external:skip"}} {
             set cmdline [read_proc_title [srv 0 pid]]
 
             assert_equal "TEST" [lindex $cmdline 0]
-            assert_match "*/placeholderkv-server" [lindex $cmdline 1]
+            assert_match "*/valkey-server" [lindex $cmdline 1]
             
             if {$::tls} {
                 set expect_port [srv 0 pport]
diff --git a/utils/generate-commands-json.py b/utils/generate-commands-json.py
index 4cd95ffd9b..59957b9f1f 100755
--- a/utils/generate-commands-json.py
+++ b/utils/generate-commands-json.py
@@ -103,7 +103,7 @@ def convert_entry_to_objects_array(cmd, docs):
 if __name__ == '__main__':
     opts = {
         'description': 'Transform the output from `redis-cli --json` using COMMAND and COMMAND DOCS to a single commands.json format.',
-        'epilog': f'Usage example: {argv[0]} --cli src/placeholderkv-cli --port 6379 > commands.json'
+        'epilog': f'Usage example: {argv[0]} --cli src/valkey-cli --port 6379 > commands.json'
     }
     parser = argparse.ArgumentParser(**opts)
     parser.add_argument('--host', type=str, default='localhost')