diff --git a/ci/scripts/run-test-network-basic.sh b/ci/scripts/run-test-network-basic.sh
index cf6db805..22cc70ad 100755
--- a/ci/scripts/run-test-network-basic.sh
+++ b/ci/scripts/run-test-network-basic.sh
@@ -109,7 +109,7 @@ echo 'go install pkcs11 enabled fabric-ca-client'
 go install -tags pkcs11 github.com/hyperledger/fabric-ca/cmd/fabric-ca-client@latest
 createNetwork
 print "Initializing Typescript HSM gateway application"
-pushd ../asset-transfer-basic/application-gateway-hsm/scripts/
+pushd ../hsm-gateway-applications/scripts/
 print "Enroll and register User in HSM"
 ./generate-hsm-user.sh HSMUser
 pushd ../node/
@@ -124,7 +124,7 @@ stopNetwork
 # Run Go HSM gateway application
 createNetwork
 print "Initializing Go HSM gateway application"
-pushd ../asset-transfer-basic/application-gateway-hsm/scripts/
+pushd ../hsm-gateway-applications/scripts/
 print "Register and enroll user in HSM"
 ./generate-hsm-user.sh HSMUser
 pushd ../go
diff --git a/asset-transfer-basic/application-gateway-hsm/.gitignore b/hsm-gateway-applications/.gitignore
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/.gitignore
rename to hsm-gateway-applications/.gitignore
diff --git a/asset-transfer-basic/application-gateway-hsm/README.md b/hsm-gateway-applications/README.md
similarity index 98%
rename from asset-transfer-basic/application-gateway-hsm/README.md
rename to hsm-gateway-applications/README.md
index efca5f0f..8b66d88f 100644
--- a/asset-transfer-basic/application-gateway-hsm/README.md
+++ b/hsm-gateway-applications/README.md
@@ -103,14 +103,14 @@ generate a certificate on the file system for use by the sample. The private key
 For HSM support you need to ensure you include the `pkcs11` build tag.
 
 ```
-cd application-gateway-hsm/go
+cd hsm-gateway-applications/go
 go run -tags pkcs11 hsm-sample.go
 ```
 
 ### Node SDK
 
 ```
-cd application-gateway-hsm/node
+cd hsm-gateway-applications/node
 npm install
 npm start
 ```
diff --git a/asset-transfer-basic/application-gateway-hsm/ca-client-config/.gitignore b/hsm-gateway-applications/ca-client-config/.gitignore
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/ca-client-config/.gitignore
rename to hsm-gateway-applications/ca-client-config/.gitignore
diff --git a/asset-transfer-basic/application-gateway-hsm/ca-client-config/fabric-ca-client-config-template.yaml b/hsm-gateway-applications/ca-client-config/fabric-ca-client-config-template.yaml
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/ca-client-config/fabric-ca-client-config-template.yaml
rename to hsm-gateway-applications/ca-client-config/fabric-ca-client-config-template.yaml
diff --git a/asset-transfer-basic/application-gateway-hsm/go/go.mod b/hsm-gateway-applications/go/go.mod
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/go/go.mod
rename to hsm-gateway-applications/go/go.mod
diff --git a/asset-transfer-basic/application-gateway-hsm/go/go.sum b/hsm-gateway-applications/go/go.sum
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/go/go.sum
rename to hsm-gateway-applications/go/go.sum
diff --git a/asset-transfer-basic/application-gateway-hsm/go/hsm-sample.go b/hsm-gateway-applications/go/hsm-sample.go
similarity index 97%
rename from asset-transfer-basic/application-gateway-hsm/go/hsm-sample.go
rename to hsm-gateway-applications/go/hsm-sample.go
index 79a98758..423f9b1a 100644
--- a/asset-transfer-basic/application-gateway-hsm/go/hsm-sample.go
+++ b/hsm-gateway-applications/go/hsm-sample.go
@@ -33,7 +33,7 @@ import (
 const (
 	mspID        = "Org1MSP"
 	certPath     = "../crypto-material/hsm/HSMUser/signcerts/cert.pem"
-	tlsCertPath  = "../../../test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt"
+	tlsCertPath  = "../../test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt"
 	peerEndpoint = "localhost:7051"
 )
 
diff --git a/asset-transfer-basic/application-gateway-hsm/node/.eslintrc.yaml b/hsm-gateway-applications/node/.eslintrc.yaml
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/node/.eslintrc.yaml
rename to hsm-gateway-applications/node/.eslintrc.yaml
diff --git a/asset-transfer-basic/application-gateway-hsm/node/.gitignore b/hsm-gateway-applications/node/.gitignore
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/node/.gitignore
rename to hsm-gateway-applications/node/.gitignore
diff --git a/asset-transfer-basic/application-gateway-hsm/node/package.json b/hsm-gateway-applications/node/package.json
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/node/package.json
rename to hsm-gateway-applications/node/package.json
diff --git a/asset-transfer-basic/application-gateway-hsm/node/src/hsm-sample.ts b/hsm-gateway-applications/node/src/hsm-sample.ts
similarity index 96%
rename from asset-transfer-basic/application-gateway-hsm/node/src/hsm-sample.ts
rename to hsm-gateway-applications/node/src/hsm-sample.ts
index dd592ccf..c1481117 100644
--- a/asset-transfer-basic/application-gateway-hsm/node/src/hsm-sample.ts
+++ b/hsm-gateway-applications/node/src/hsm-sample.ts
@@ -22,7 +22,7 @@ const utf8Decoder = new TextDecoder();
 
 const certPath = path.resolve(__dirname, '..', '..', 'crypto-material', 'hsm', user, 'signcerts', 'cert.pem');
 
-const tlsCertPath = path.resolve('..', '..', '..', 'test-network','organizations','peerOrganizations', 'org1.example.com', 'peers', 'peer0.org1.example.com', 'tls', 'ca.crt');
+const tlsCertPath = path.resolve('..', '..', 'test-network','organizations','peerOrganizations', 'org1.example.com', 'peers', 'peer0.org1.example.com', 'tls', 'ca.crt');
 const peerEndpoint = 'localhost:7051';
 
 async function main() {
diff --git a/asset-transfer-basic/application-gateway-hsm/node/tsconfig.json b/hsm-gateway-applications/node/tsconfig.json
similarity index 100%
rename from asset-transfer-basic/application-gateway-hsm/node/tsconfig.json
rename to hsm-gateway-applications/node/tsconfig.json
diff --git a/asset-transfer-basic/application-gateway-hsm/scripts/generate-hsm-user.sh b/hsm-gateway-applications/scripts/generate-hsm-user.sh
similarity index 96%
rename from asset-transfer-basic/application-gateway-hsm/scripts/generate-hsm-user.sh
rename to hsm-gateway-applications/scripts/generate-hsm-user.sh
index ac5a93a1..ca079d1b 100755
--- a/asset-transfer-basic/application-gateway-hsm/scripts/generate-hsm-user.sh
+++ b/hsm-gateway-applications/scripts/generate-hsm-user.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 # define the CA setup
 CA_HOST=localhost
 CA_URL=${CA_HOST}:7054
-TLS_CERT='../../../test-network/organizations/fabric-ca/org1/tls-cert.pem'
+TLS_CERT='../../test-network/organizations/fabric-ca/org1/tls-cert.pem'
 
 LocateHsmLib() {
   if [[ -n "${PKCS11_LIB}" && -f "${PKCS11_LIB}" ]]; then