diff --git a/README.md b/README.md
index 9d3b28b..3f4f9f8 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ All documents are put at [doc](./doc/) folder.
 
 ### Checkout repo
 ```
-git clone https://github.com/intel/rust-spdm.git
+git clone https://github.com/intel/spdm-rs.git
 git submodule update --init --recursive
 ```
 
@@ -198,7 +198,7 @@ nmake copy_sample_key
 nmake
 ```
 
-Test rust-spdm as requester:
+Test spdm-rs as requester:
 
 1. run libspdm in spdm-emu as responder:
 ```
@@ -206,14 +206,14 @@ cd bin
 spdm_responder_emu.exe --trans PCI_DOE
 ```
 
-2. run rust-spdm-emu as requester:
+2. run spdm-rs-emu as requester:
 ```
 cargo run -p spdm-requester-emu --no-default-features --features "spdm-ring,hashed-transcript-data,async-executor "
 ```
 
-Test rust-spdm as responder:
+Test spdm-rs as responder:
 
-1. run rust-spdm-emu as Test rust-spdm as responder:
+1. run spdm-rs-emu as Test spdm-rs as responder:
 ```
 cargo run -p spdm-responder-emu --no-default-features --features "spdm-ring,hashed-transcript-data,async-executor "
 ```
diff --git a/doc/coverage.md b/doc/coverage.md
index e7d3388..0c1058f 100644
--- a/doc/coverage.md
+++ b/doc/coverage.md
@@ -33,7 +33,7 @@ rustup component add llvm-tools-preview
 ```bash
 # Export the flags needed to instrument the program to collect code coverage.
 export RUSTFLAGS="-Zinstrument-coverage"
-export LLVM_PROFILE_FILE="rust-spdm-%p%m.profraw"
+export LLVM_PROFILE_FILE="spdm-rs-%p%m.profraw"
 
 # Build the program
 cargo build -p spdm-responder-emu -p spdm-requester-emu
diff --git a/sh_script/build.sh b/sh_script/build.sh
index bc42fd9..9234a3e 100644
--- a/sh_script/build.sh
+++ b/sh_script/build.sh
@@ -46,50 +46,50 @@ check() {
 RUSTFLAGS=${RUSTFLAGS:-}
 build() {
     pushd spdmlib
-    echo "Building Rust-SPDM..."
+    echo "Building spdm-rs..."
     cargo build
     
-    echo "Building Rust-SPDM with no-default-features..."
+    echo "Building spdm-rs with no-default-features..."
     echo_command cargo build --release --no-default-features
     
-    echo "Building Rust-SPDM with spdm-ring feature..."
+    echo "Building spdm-rs with spdm-ring feature..."
     echo_command cargo build --release --no-default-features --features=spdm-ring
 
-    echo "Building Rust-SPDM with spdm-ring,is_sync feature..."
+    echo "Building spdm-rs with spdm-ring,is_sync feature..."
     echo_command cargo build --release --no-default-features --features=spdm-ring,is_sync
     
-    echo "Building Rust-SPDM with spdm-ring,hashed-transcript-data feature..."
+    echo "Building spdm-rs with spdm-ring,hashed-transcript-data feature..."
     echo_command cargo build --release --no-default-features --features=spdm-ring,hashed-transcript-data
 
-    echo "Building Rust-SPDM with spdm-ring,hashed-transcript-data,is_sync feature..."
+    echo "Building spdm-rs with spdm-ring,hashed-transcript-data,is_sync feature..."
     echo_command cargo build --release --no-default-features --features=spdm-ring,hashed-transcript-data,is_sync
 
-    echo "Building Rust-SPDM with spdm-ring,hashed-transcript-data,mut-auth feature..."
+    echo "Building spdm-rs with spdm-ring,hashed-transcript-data,mut-auth feature..."
     echo_command cargo build --release --no-default-features --features=spdm-ring,hashed-transcript-data,mut-auth
 
-    echo "Building Rust-SPDM with spdm-ring,hashed-transcript-data,mut-auth,is_sync feature..."
+    echo "Building spdm-rs with spdm-ring,hashed-transcript-data,mut-auth,is_sync feature..."
     echo_command cargo build --release --no-default-features --features=spdm-ring,hashed-transcript-data,mut-auth,is_sync
 
     if [ -z "$RUSTFLAGS" ]; then
-        echo "Building Rust-SPDM in no std with no-default-features..."
+        echo "Building spdm-rs in no std with no-default-features..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features
     
-        echo "Building Rust-SPDM in no std with spdm-ring feature..."
+        echo "Building spdm-rs in no std with spdm-ring feature..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features --features="spdm-ring"
     
-        echo "Building Rust-SPDM in no std with spdm-ring,is_sync feature..."
+        echo "Building spdm-rs in no std with spdm-ring,is_sync feature..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features --features="spdm-ring,is_sync"
 
-        echo "Building Rust-SPDM in no std with spdm-ring,hashed-transcript-data feature..."
+        echo "Building spdm-rs in no std with spdm-ring,hashed-transcript-data feature..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features --features="spdm-ring,hashed-transcript-data"
     
-        echo "Building Rust-SPDM in no std with spdm-ring,hashed-transcript-data,is_sync feature..."
+        echo "Building spdm-rs in no std with spdm-ring,hashed-transcript-data,is_sync feature..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features --features="spdm-ring,hashed-transcript-data,is_sync"
 
-        echo "Building Rust-SPDM in no std with spdm-ring,hashed-transcript-data,mut-auth feature..."
+        echo "Building spdm-rs in no std with spdm-ring,hashed-transcript-data,mut-auth feature..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features --features="spdm-ring,hashed-transcript-data,mut-auth"
     
-        echo "Building Rust-SPDM in no std with spdm-ring,hashed-transcript-data,mut-auth,is_sync feature..."
+        echo "Building spdm-rs in no std with spdm-ring,hashed-transcript-data,mut-auth,is_sync feature..."
         echo_command cargo build -Z build-std=core,alloc,compiler_builtins --target x86_64-unknown-none --release --no-default-features --features="spdm-ring,hashed-transcript-data,mut-auth,is_sync"
     fi
 
diff --git a/sh_script/fuzz_run.sh b/sh_script/fuzz_run.sh
index cbca3c2..a60cc46 100644
--- a/sh_script/fuzz_run.sh
+++ b/sh_script/fuzz_run.sh
@@ -34,7 +34,7 @@ process_args() {
 
 process_args "$@"
 
-if [[ ! $PWD =~ rust-spdm$ ]]; then
+if [[ ! $PWD =~ spdm-rs$ ]]; then
     pushd ..
 fi
 
diff --git a/sh_script/rudra.sh b/sh_script/rudra.sh
index f42eb14..f67e876 100644
--- a/sh_script/rudra.sh
+++ b/sh_script/rudra.sh
@@ -7,7 +7,7 @@ if [[ $? != 0 ]]; then
     exit
 fi
 
-if [[ ! $PWD =~ rust-spdm$ ]];then
+if [[ ! $PWD =~ spdm-rs$ ]];then
     pushd ..
 fi
 
diff --git a/sh_script/test_spdm_coverage.sh b/sh_script/test_spdm_coverage.sh
index 5fb735b..6ad7bc8 100644
--- a/sh_script/test_spdm_coverage.sh
+++ b/sh_script/test_spdm_coverage.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-if [[ ! $PWD =~ rust-spdm$ ]];then
+if [[ ! $PWD =~ spdm-rs$ ]];then
     pushd ..
 fi
 
 rm -rf ./target
 
 export RUSTFLAGS="-Zinstrument-coverage"
-export LLVM_PROFILE_FILE="rust-spdm-%p%m.profraw"
+export LLVM_PROFILE_FILE="spdm-rs-%p%m.profraw"
 
 cargo build -p spdm-responder-emu -p spdm-requester-emu
 
diff --git a/sh_script/test_spdm_unit_test_coverage.sh b/sh_script/test_spdm_unit_test_coverage.sh
index bce9bba..16c13da 100644
--- a/sh_script/test_spdm_unit_test_coverage.sh
+++ b/sh_script/test_spdm_unit_test_coverage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 cargo clean
 
-if [[ ! $PWD =~ rust-spdm$ ]];then
+if [[ ! $PWD =~ spdm-rs$ ]];then
     pushd ..
 fi
 
diff --git a/spdmlib/src/error.rs b/spdmlib/src/error.rs
index 99f53a2..d6ee8c1 100644
--- a/spdmlib/src/error.rs
+++ b/spdmlib/src/error.rs
@@ -60,7 +60,7 @@ pub enum StatusCodeCore {
     ACQUIRE_FAIL = 16,
     SESSION_TRY_DISCARD_KEY_UPDATE = 17,
 
-    // only in Rust-SPDM
+    // only in spdm-rs
     DECODE_AEAD_FAIL = 0xFE,
 }
 
@@ -163,7 +163,7 @@ pub enum StatusCodeTransport {
     SEND_FAIL = 0,
     RECEIVE_FAIL = 1,
 
-    // only in Rust-SPDM
+    // only in spdm-rs
     DECAP_FAIL = 0xFE,
     DECAP_APP_FAIL = 0xFD,
     ENCAP_FAIL = 0xFC,