diff --git a/README.md b/README.md
index b368cc3..7305d1b 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@
 
 Stacks to run nodes for laconic-testnet
 
-- [Full node stack documentation](stack-orchestrator/stacks/laconicd-full-node/README.md)
+- [Stack documentation](./stack-orchestrator/stacks/testnet-laconicd/README.md)
diff --git a/stack-orchestrator/compose/docker-compose-laconicd-full-node.yml b/stack-orchestrator/compose/docker-compose-testnet-laconicd.yml
similarity index 100%
rename from stack-orchestrator/compose/docker-compose-laconicd-full-node.yml
rename to stack-orchestrator/compose/docker-compose-testnet-laconicd.yml
diff --git a/stack-orchestrator/container-build/cerc-laconic2d/build.sh b/stack-orchestrator/container-build/cerc-laconic2d/build.sh
index 1c4f7de..2265c85 100755
--- a/stack-orchestrator/container-build/cerc-laconic2d/build.sh
+++ b/stack-orchestrator/container-build/cerc-laconic2d/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-# Build cerc/laconicd
+# Build cerc/laconic2d
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 docker build -t cerc/laconic2d:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconic2d
diff --git a/stack-orchestrator/stacks/laconicd-full-node/README.md b/stack-orchestrator/stacks/testnet-laconicd/README.md
similarity index 65%
rename from stack-orchestrator/stacks/laconicd-full-node/README.md
rename to stack-orchestrator/stacks/testnet-laconicd/README.md
index 05ba436..8511c6a 100644
--- a/stack-orchestrator/stacks/laconicd-full-node/README.md
+++ b/stack-orchestrator/stacks/testnet-laconicd/README.md
@@ -1,4 +1,4 @@
-# laconicd-full-node
+# laconicd-testnet
 
 Instructions for running a laconicd testnet full node and joining as a validator
 
@@ -25,13 +25,13 @@ Instructions for running a laconicd testnet full node and joining as a validator
 * Clone required repositories:
 
   ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node setup-repositories
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/testnet-laconicd setup-repositories
   ```
 
 * Build the container images:
 
   ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node build-containers
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/testnet-laconicd build-containers
   ```
 
   This should create the following docker images locally:
@@ -43,7 +43,7 @@ Instructions for running a laconicd testnet full node and joining as a validator
 * Create a spec file for the deployment:
 
   ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node deploy init --output laconic-full-node-spec.yml
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/testnet-laconicd deploy init --output testnet-laconicd-spec.yml
   ```
 
 * Edit `network` in the spec file to map container ports to host ports as required:
@@ -64,15 +64,15 @@ Instructions for running a laconicd testnet full node and joining as a validator
 * Create a deployment from the spec file:
 
   ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node deploy create --spec-file  laconic-full-node-spec.yml --deployment-dir laconic-full-node-deployment
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/testnet-laconicd deploy create --spec-file  testnet-laconicd-spec.yml --deployment-dir testnet-laconicd-deployment
   ```
 
-* Copy over the published testnet genesis file (`.json`) to data directory in deployment (`laconic-full-node-deployment/data/laconicd-data/tmp`):
+* Copy over the published testnet genesis file (`.json`) to data directory in deployment (`testnet-laconicd-deployment/data/laconicd-data/tmp`):
 
   ```bash
   # Example
-  mkdir -p laconic-full-node-deployment/data/laconicd-data/tmp
-  cp genesis.json laconic-full-node-deployment/data/laconicd-data/tmp/genesis.json
+  mkdir -p testnet-laconicd-deployment/data/laconicd-data/tmp
+  cp genesis.json testnet-laconicd-deployment/data/laconicd-data/tmp/genesis.json
   ```
 
 ## Configuration
@@ -99,7 +99,7 @@ Instructions for running a laconicd testnet full node and joining as a validator
 ## Start the deployment
 
 ```bash
-laconic-so deployment --dir laconic-full-node-deployment start
+laconic-so deployment --dir testnet-laconicd-deployment start
 ```
 
 ## Check status
@@ -111,13 +111,13 @@ laconic-so deployment --dir laconic-full-node-deployment start
   docker ps -a
 
   # Follow logs for laconicd container
-  laconic-so deployment --dir laconic-full-node-deployment logs laconicd -f
+  laconic-so deployment --dir testnet-laconicd-deployment logs laconicd -f
   ```
 
 * Check the sync status of your node:
 
   ```bash
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd "laconicd status | jq .sync_info"
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd status | jq .sync_info"
 
   # `catching_up: false` indicates that node is completely synced
   ```
@@ -128,15 +128,15 @@ laconic-so deployment --dir laconic-full-node-deployment start
 
   ```bash
   # Create new keypair
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd "laconicd keys add <key-name>"
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd keys add <key-name>"
 
   # OR
   # Restore existing key with mnemonic seed phrase
   # You will be prompted to enter mnemonic seed
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd "laconicd keys add <key-name> --recover"
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd keys add <key-name> --recover"
 
   # Query the keystore for your account's address
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd "laconicd keys show <key-name> -a"
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd keys show <key-name> -a"
   ```
 
 * Request tokens from the testnet faucet for your account if required
@@ -144,14 +144,14 @@ laconic-so deployment --dir laconic-full-node-deployment start
 * Check balance for your account:
 
   ```bash
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd "laconicd query bank balances <key-name>"
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd query bank balances <key-name>"
   ```
 
 * Create required validator configuration:
 
   ```bash
   # Edit the staking amount and other fields as required
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd 'cat <<EOF > <your-node-moniker>-validator.json
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd 'cat <<EOF > <your-node-moniker>-validator.json
   {
     "pubkey": $(laconicd cometbft show-validator),
     "amount": "900000000photon",
@@ -167,7 +167,7 @@ laconic-so deployment --dir laconic-full-node-deployment start
 * Create a validator:
 
   ```bash
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd 'laconicd tx staking create-validator <your-node-moniker>-validator.json \
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd 'laconicd tx staking create-validator <your-node-moniker>-validator.json \
   --fees 50photon \
   --chain-id=laconic_9000-1 \
   --from <key-name>'
@@ -176,7 +176,7 @@ laconic-so deployment --dir laconic-full-node-deployment start
 * View your staking validator details:
 
   ```bash
-  laconic-so deployment --dir laconic-full-node-deployment exec laconicd "laconicd query staking validator <key-name>"
+  laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd query staking validator <key-name>"
   ```
 
 ## Clean up
@@ -185,15 +185,15 @@ laconic-so deployment --dir laconic-full-node-deployment start
 
   ```bash
   # Stop the docker containers
-  laconic-so deployment --dir laconic-full-node-deployment stop
+  laconic-so deployment --dir testnet-laconicd-deployment stop
   ```
 
 * To stop all services and also delete data:
 
   ```bash
   # Stop the docker containers
-  laconic-so deployment --dir laconic-full-node-deployment stop --delete-volumes
+  laconic-so deployment --dir testnet-laconicd-deployment stop --delete-volumes
 
   # Remove deployment directory (deployment will have to be recreated for a re-run)
-  rm -r laconic-full-node-deployment
+  rm -r testnet-laconicd-deployment
   ```
diff --git a/stack-orchestrator/stacks/laconicd-full-node/stack.yml b/stack-orchestrator/stacks/testnet-laconicd/stack.yml
similarity index 72%
rename from stack-orchestrator/stacks/laconicd-full-node/stack.yml
rename to stack-orchestrator/stacks/testnet-laconicd/stack.yml
index 677b1d2..82252ba 100644
--- a/stack-orchestrator/stacks/laconicd-full-node/stack.yml
+++ b/stack-orchestrator/stacks/testnet-laconicd/stack.yml
@@ -1,9 +1,9 @@
 version: "1.0"
-name: laconicd-full-node
+name: testnet-laconicd
 description: "Laconicd full node"
 repos:
   - git.vdb.to/cerc-io/laconic2d
 containers:
   - cerc/laconic2d
 pods:
-  - laconicd-full-node
+  - testnet-laconicd