diff --git a/install/protocol-server-data/bap-client.yaml-sample b/install/protocol-server-data/bap-client.yaml-sample
index 610c5c8..96b1e35 100644
--- a/install/protocol-server-data/bap-client.yaml-sample
+++ b/install/protocol-server-data/bap-client.yaml-sample
@@ -112,7 +112,7 @@ app:
   # Mandatory.
   registryUrl: REGISTRY_URL
   auth: false
-  uniqueKey: "BAP_SUBSCRIBER_ID_KEY"
+  uniqueKey: "BAP_SUBSCRIBER_KEY_ID"
   
   # Mandatory.
   city: "std:080"
diff --git a/install/protocol-server-data/bap-network.yaml-sample b/install/protocol-server-data/bap-network.yaml-sample
index ec34c41..1af96fd 100644
--- a/install/protocol-server-data/bap-network.yaml-sample
+++ b/install/protocol-server-data/bap-network.yaml-sample
@@ -112,7 +112,7 @@ app:
   # Mandatory.
   registryUrl: REGISTRY_URL
   auth: false
-  uniqueKey: "BAP_SUBSCRIBER_ID_KEY"
+  uniqueKey: "BAP_SUBSCRIBER_KEY_ID"
   
   # Mandatory.
   city: "std:080"
diff --git a/install/protocol-server-data/bpp-client.yaml-sample b/install/protocol-server-data/bpp-client.yaml-sample
index d3dd737..6e2fe75 100644
--- a/install/protocol-server-data/bpp-client.yaml-sample
+++ b/install/protocol-server-data/bpp-client.yaml-sample
@@ -110,7 +110,7 @@ app:
   # Mandatory.
   registryUrl: REGISTRY_URL
   auth: true
-  uniqueKey: "BPP_SUBSCRIBER_ID_KEY"
+  uniqueKey: "BPP_SUBSCRIBER_KEY_ID"
   
   # Mandatory.
   city: "std:080"
diff --git a/install/protocol-server-data/bpp-network.yaml-sample b/install/protocol-server-data/bpp-network.yaml-sample
index 0987b21..b837568 100644
--- a/install/protocol-server-data/bpp-network.yaml-sample
+++ b/install/protocol-server-data/bpp-network.yaml-sample
@@ -110,7 +110,7 @@ app:
   # Mandatory.
   registryUrl: REGISTRY_URL
   auth: true
-  uniqueKey: "BPP_SUBSCRIBER_ID_KEY"
+  uniqueKey: "BPP_SUBSCRIBER_KEY_ID"
   
   # Mandatory.
   city: "std:080"
diff --git a/install/scripts/update_bap_config.sh b/install/scripts/update_bap_config.sh
index 261fb45..ec4530e 100755
--- a/install/scripts/update_bap_config.sh
+++ b/install/scripts/update_bap_config.sh
@@ -30,7 +30,7 @@ fi
 if [[ $1 ]]; then
     registry_url=$1
     bap_subscriber_id=$2
-    bap_subscriber_id_key=$3
+    bap_subscriber_key_id=$3
     bap_subscriber_url=$4
 else
     if [[ $(uname -s) == 'Darwin' ]]; then
@@ -79,7 +79,7 @@ if [[ $(uname -s ) == 'Darwin' ]];then
         "PUBLIC_KEY=$public_key"
         "BAP_SUBSCRIBER_ID=$bap_subscriber_id"
         "BAP_SUBSCRIBER_URL=$bap_subscriber_url"
-        "BAP_SUBSCRIBER_ID_KEY=$bap_subscriber_id_key"
+        "BAP_SUBSCRIBER_KEY_ID=$bap_subscriber_key_id"
     )
 
     echo "Configuring BAP protocol server"
@@ -107,7 +107,7 @@ else
         ["PUBLIC_KEY"]=$public_key
         ["BAP_SUBSCRIBER_ID"]=$bap_subscriber_id
         ["BAP_SUBSCRIBER_URL"]=$bap_subscriber_url
-        ["BAP_SUBSCRIBER_ID_KEY"]=$bap_subscriber_id_key
+        ["BAP_SUBSCRIBER_KEY_ID"]=$bap_subscriber_key_id
     )
 
     echo "Configuring BAP protocol server"
@@ -121,4 +121,4 @@ fi
 
 echo "Registering BAP protocol server on the registry"
 
-create_network_participant "$registry_url" "application/json" "$bap_subscriber_id" "$bap_subscriber_id_key" "$bap_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type"
\ No newline at end of file
+create_network_participant "$registry_url" "application/json" "$bap_subscriber_id" "$bap_subscriber_key_id" "$bap_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type"
\ No newline at end of file
diff --git a/install/scripts/update_bpp_config.sh b/install/scripts/update_bpp_config.sh
index 07b2f75..2166dd4 100755
--- a/install/scripts/update_bpp_config.sh
+++ b/install/scripts/update_bpp_config.sh
@@ -30,7 +30,7 @@ fi
 if [[ $1 ]]; then
     registry_url=$1
     bpp_subscriber_id=$2
-    bpp_subscriber_id_key=$3
+    bpp_subscriber_key_id=$3
     bpp_subscriber_url=$4
     webhook_url=$5
 else
@@ -77,7 +77,7 @@ if [[ $(uname -s ) == 'Darwin' ]];then
         "PUBLIC_KEY=$public_key"
         "BPP_SUBSCRIBER_URL=$bpp_subscriber_url"
         "BPP_SUBSCRIBER_ID=$bpp_subscriber_id"
-        "BPP_SUBSCRIBER_ID_KEY=$bpp_subscriber_id_key"
+        "BPP_SUBSCRIBER_KEY_ID=$bpp_subscriber_key_id"
         "WEBHOOK_URL=$webhook_url"
     )
 
@@ -107,7 +107,7 @@ else
         ["PUBLIC_KEY"]=$public_key
         ["BPP_SUBSCRIBER_URL"]=$bpp_subscriber_url
         ["BPP_SUBSCRIBER_ID"]=$bpp_subscriber_id
-        ["BPP_SUBSCRIBER_ID_KEY"]=$bpp_subscriber_id_key
+        ["BPP_SUBSCRIBER_KEY_ID"]=$bpp_subscriber_key_id
         ["WEBHOOK_URL"]=$webhook_url
     )
 
@@ -122,4 +122,4 @@ fi
 
 echo "Registering BPP protocol server on the registry"
 
-create_network_participant "$registry_url" "application/json" "$bpp_subscriber_id" "$bpp_subscriber_id_key" "$bpp_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type"
\ No newline at end of file
+create_network_participant "$registry_url" "application/json" "$bpp_subscriber_id" "$bpp_subscriber_key_id" "$bpp_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type"
\ No newline at end of file
diff --git a/install/scripts/variables.sh b/install/scripts/variables.sh
index d5d2f8c..94e1f64 100755
--- a/install/scripts/variables.sh
+++ b/install/scripts/variables.sh
@@ -35,7 +35,7 @@ bap_client_port=5001
 bap_network_port=5002
 
 bap_subscriber_id="bap-network"
-bap_subscriber_id_key="bap-network-key"
+bap_subscriber_key_id="bap-network-key"
 bap_subscriber_url="http://bap-network:5002"
 bap_client_url="http://bap-client:5002"
 
@@ -48,6 +48,6 @@ bpp_client_port=6001
 bpp_network_port=6002
 
 bpp_subscriber_id="bpp-network"
-bpp_subscriber_id_key="bpp-network-key"
+bpp_subscriber_key_id="bpp-network-key"
 bpp_subscriber_url="http://bpp-network:6002"
 webhook_url="http://sandbox-webhook:3005"
diff --git a/install/start_beckn_v2.sh b/install/start_beckn_v2.sh
index 4e480b0..7864b45 100755
--- a/install/start_beckn_v2.sh
+++ b/install/start_beckn_v2.sh
@@ -106,9 +106,9 @@ install_bap_protocol_server(){
     if [[ $1 ]];then
         registry_url=$1
         bap_subscriber_id=$2
-        bap_subscriber_id_key=$3
+        bap_subscriber_key_id=$3
         bap_subscriber_url=$4
-        bash scripts/update_bap_config.sh $registry_url $bap_subscriber_id $bap_subscriber_id_key $bap_subscriber_url
+        bash scripts/update_bap_config.sh $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url
     else
         bash scripts/update_bap_config.sh
     fi
@@ -137,9 +137,9 @@ install_bpp_protocol_server_with_sandbox(){
     if [[ $1 ]];then
         registry_url=$1
         bpp_subscriber_id=$2
-        bpp_subscriber_id_key=$3
+        bpp_subscriber_key_id=$3
         bpp_subscriber_url=$4
-        bash scripts/update_bpp_config.sh $registry_url $bpp_subscriber_id $bpp_subscriber_id_key $bpp_subscriber_url
+        bash scripts/update_bpp_config.sh $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url
     else
         bash scripts/update_bpp_config.sh
     fi
@@ -159,10 +159,10 @@ install_bpp_protocol_server(){
     if [[ $1 ]];then
         registry_url=$1
         bpp_subscriber_id=$2
-        bpp_subscriber_id_key=$3
+        bpp_subscriber_key_id=$3
         bpp_subscriber_url=$4
         webhook_url=$5
-        bash scripts/update_bpp_config.sh $registry_url $bpp_subscriber_id $bpp_subscriber_id_key $bpp_subscriber_url $webhook_url
+        bash scripts/update_bpp_config.sh $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url $webhook_url
     else
         bash scripts/update_bpp_config.sh
     fi
@@ -248,9 +248,9 @@ else
             # Ask the user if they want to change the registry_url
             read -p "Do you want to change the registry_url? (${GREEN}Press Enter to accept default: $beckn_registry_url${NC}): " custom_registry_url
             registry_url=${custom_registry_url:-$beckn_registry_url}
-            bap_subscriber_id_key=$bap_subscriber_id-key
+            bap_subscriber_key_id=$bap_subscriber_id-key
             install_package
-            install_bap_protocol_server $registry_url $bap_subscriber_id $bap_subscriber_id_key $bap_subscriber_url
+            install_bap_protocol_server $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url
             ;;
         3)
             read -p "Enter BPP Subscriber ID: " bpp_subscriber_id
@@ -258,9 +258,9 @@ else
             # Ask the user if they want to change the registry_url
             read -p "Do you want to change the registry_url? (${GREEN}Press Enter to accept default: $beckn_registry_url${NC}): " custom_registry_url
             registry_url=${custom_registry_url:-$beckn_registry_url}
-            bpp_subscriber_id_key=$bpp_subscriber_id-key
+            bpp_subscriber_key_id=$bpp_subscriber_id-key
             install_package
-            install_bpp_protocol_server_with_sandbox $registry_url $bpp_subscriber_id $bpp_subscriber_id_key $bpp_subscriber_url
+            install_bpp_protocol_server_with_sandbox $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url
             ;;
         4)
             read -p "Enter BPP Subscriber ID: " bpp_subscriber_id
@@ -270,9 +270,9 @@ else
             # Ask the user if they want to change the registry_url
             read -p "Do you want to change the registry_url? (${GREEN}Press Enter to accept default: $beckn_registry_url${NC}): " custom_registry_url
             registry_url=${custom_registry_url:-$beckn_registry_url}
-            bpp_subscriber_id_key=$bpp_subscriber_id-key
+            bpp_subscriber_key_id=$bpp_subscriber_id-key
             install_package
-            install_bpp_protocol_server $registry_url $bpp_subscriber_id $bpp_subscriber_id_key $bpp_subscriber_url $webhook_url
+            install_bpp_protocol_server $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url $webhook_url
             ;;
 
         5)