diff --git a/cmd/lotus-storage-miner/main.go b/cmd/lotus-storage-miner/main.go
index 05bf63e72..acb4ac71a 100644
--- a/cmd/lotus-storage-miner/main.go
+++ b/cmd/lotus-storage-miner/main.go
@@ -81,7 +81,7 @@ func main() {
 			&cli.StringFlag{
 				Name:    FlagMinerRepo,
 				EnvVars: []string{"LOTUS_MINER_PATH"},
-				Value:   "~/.lotusstorage", // TODO: Consider XDG_DATA_HOME
+				Value:   "~/.lotusminer", // TODO: Consider XDG_DATA_HOME
 			},
 		},
 
diff --git a/documentation/en/api-scripting-support.md b/documentation/en/api-scripting-support.md
index 9d07aa3c8..0f39bbde3 100644
--- a/documentation/en/api-scripting-support.md
+++ b/documentation/en/api-scripting-support.md
@@ -21,5 +21,5 @@ You can also use `lotus auth api-info --perm admin` to quickly create _API_INFO
 
 - The **Lotus Node**'s `mutliaddr` is in `~/.lotus/api`.
 - The default token is in `~/.lotus/token`.
-- The **Lotus Storage Miner**'s `multiaddr` is in `~/.lotusstorage/config`.
-- The default token is in `~/.lotusstorage/token`.
+- The **Lotus Storage Miner**'s `multiaddr` is in `~/.lotusminer/config`.
+- The default token is in `~/.lotusminer/token`.
diff --git a/documentation/en/api.md b/documentation/en/api.md
index 5b5f01aee..af8cd4aed 100644
--- a/documentation/en/api.md
+++ b/documentation/en/api.md
@@ -46,7 +46,7 @@ If the request requires authorization, add an authorization header:
 ```sh
 curl -X POST \
      -H "Content-Type: application/json" \
-     -H "Authorization: Bearer $(cat ~/.lotusstorage/token)" \
+     -H "Authorization: Bearer $(cat ~/.lotusminer/token)" \
      --data '{ "jsonrpc": "2.0", "method": "Filecoin.ChainHead", "params": [], "id": 3 }' \
      'http://127.0.0.1:1234/rpc/v0'
 ```
@@ -58,10 +58,10 @@ curl -X POST \
 To authorize your request, you will need to include the **JWT** in a HTTP header, for example:
 
 ```sh
--H "Authorization: Bearer $(cat ~/.lotusstorage/token)"
+-H "Authorization: Bearer $(cat ~/.lotusminer/token)"
 ```
 
-Admin token is stored in `~/.lotus/token` for the **Lotus Node** or `~/.lotusstorage/token` for the **Lotus Storage Miner**.
+Admin token is stored in `~/.lotus/token` for the **Lotus Node** or `~/.lotusminer/token` for the **Lotus Storage Miner**.
 
 ## How do I generate a token?
 
diff --git a/documentation/en/dev-tools-pond-ui.md b/documentation/en/dev-tools-pond-ui.md
index e5c992073..b75a53727 100644
--- a/documentation/en/dev-tools-pond-ui.md
+++ b/documentation/en/dev-tools-pond-ui.md
@@ -27,6 +27,6 @@ Don't leave Pond unattended for more than 10 hours, the web client will eventual
 ## Troubleshooting
 
 - Turn it off and on - Start at the top
-- `rm -rf ~/.lotus ~/.lotusstorage/`, this command will delete chain sync data, stored wallets, and other configurations so be careful.
+- `rm -rf ~/.lotus ~/.lotusminer/`, this command will delete chain sync data, stored wallets, and other configurations so be careful.
 - Verify you have the correct versions of dependencies
 - If stuck on a bad fork, try `lotus chain sethead --genesis`
diff --git a/documentation/en/faqs.md b/documentation/en/faqs.md
index 3157ab445..0f89f53c4 100644
--- a/documentation/en/faqs.md
+++ b/documentation/en/faqs.md
@@ -49,7 +49,7 @@ To update Lotus, follow the instructions [here](https://lotu.sh/en+updating-lotu
 ### How do I prepare a fresh installation of Lotus?
 
 Stop the Lotus daemon, and delete all related files, including sealed and chain data by 
-running `rm ~/.lotus ~/.lotusstorage`.
+running `rm ~/.lotus ~/.lotusminer`.
 
 Then, install Lotus afresh by following the instructions 
 found [here](https://docs.lotu.sh/en+getting-started).
@@ -126,7 +126,7 @@ Community-contributed Docker and Docker Compose examples are available
 ### How can I run two miners on the same machine?
 
 You can do so by changing the storage path variable for the second miner, e.g.,
-`LOTUS_MINER_PATH=~/.lotusstorage2`. You will also need to make sure that no ports collide.
+`LOTUS_MINER_PATH=~/.lotusminer2`. You will also need to make sure that no ports collide.
 
 ### How do I setup my own local devnet?     
 
diff --git a/documentation/en/mining-lotus-seal-worker.md b/documentation/en/mining-lotus-seal-worker.md
index 30517e33c..58000d226 100644
--- a/documentation/en/mining-lotus-seal-worker.md
+++ b/documentation/en/mining-lotus-seal-worker.md
@@ -22,7 +22,7 @@ make lotus-seal-worker
 
 First, you will need to ensure your `lotus-miner`'s API is accessible over the network.
 
-To do this, open up `~/.lotusstorage/config.toml` (Or if you manually set `LOTUS_MINER_PATH`, look under that directory) and look for the API field.
+To do this, open up `~/.lotusminer/config.toml` (Or if you manually set `LOTUS_MINER_PATH`, look under that directory) and look for the API field.
 
 Default config:
 
diff --git a/documentation/en/mining-troubleshooting.md b/documentation/en/mining-troubleshooting.md
index 5ea1c8e48..62aa776ac 100644
--- a/documentation/en/mining-troubleshooting.md
+++ b/documentation/en/mining-troubleshooting.md
@@ -22,7 +22,7 @@ This bug occurs when the storage miner can't acquire the `bellman.lock`. To fix
 
 ```sh
 lotus-miner info
-# WARN  main  lotus-storage-miner/main.go:73  failed to get api endpoint: (/Users/myrmidon/.lotusstorage) %!w(*errors.errorString=&{API not running (no endpoint)}):
+# WARN  main  lotus-storage-miner/main.go:73  failed to get api endpoint: (/Users/myrmidon/.lotusminer) %!w(*errors.errorString=&{API not running (no endpoint)}):
 ```
 
 If you see this, that means your **Lotus Storage Miner** isn't ready yet. You need to finish [syncing the chain](https://docs.lotu.sh/en+join-testnet).
diff --git a/documentation/en/setting-a-static-port.md b/documentation/en/setting-a-static-port.md
index f6c716446..7b4ed1c32 100644
--- a/documentation/en/setting-a-static-port.md
+++ b/documentation/en/setting-a-static-port.md
@@ -4,7 +4,7 @@ Depending on how your network is set up, you may need to set a static port to su
 
 ## Setup
 
-To change the random **swarm port**, you may edit the `config.toml` file located under `$LOTUS_MINER_PATH`. The default location of this file is `$HOME/.lotusstorage`.
+To change the random **swarm port**, you may edit the `config.toml` file located under `$LOTUS_MINER_PATH`. The default location of this file is `$HOME/.lotusminer`.
 
 To change the port to `1347`:
 
diff --git a/documentation/en/setup-troubleshooting.md b/documentation/en/setup-troubleshooting.md
index 8a23544d9..a1c78b51b 100644
--- a/documentation/en/setup-troubleshooting.md
+++ b/documentation/en/setup-troubleshooting.md
@@ -5,7 +5,7 @@
 Here is a command that will delete your chain data, stored wallets, stored data and any miners you have set up:
 
 ```sh
-rm -rf ~/.lotus ~/.lotusstorage
+rm -rf ~/.lotus ~/.lotusminer
 ```
 
 This command usually resolves any issues with running `lotus` but it is not always required for updates. We will share information about when resetting your chain data and miners is required for an update in the future.
diff --git a/scripts/deploy-bootstrapper.sh b/scripts/deploy-bootstrapper.sh
index fe0924ae4..3ca0d51a2 100755
--- a/scripts/deploy-bootstrapper.sh
+++ b/scripts/deploy-bootstrapper.sh
@@ -15,7 +15,7 @@ ssh "$host" 'systemctl stop lotus-miner' &
 wait
 
 ssh "$host" 'rm -rf .lotus' &
-ssh "$host" 'rm -rf .lotusstorage' &
+ssh "$host" 'rm -rf .lotusminer' &
 
 scp -C lotus "${host}":/usr/local/bin/lotus &
 scp -C lotus-miner "${host}":/usr/local/bin/lotus-miner &
diff --git a/scripts/deploy-miner.sh b/scripts/deploy-miner.sh
index 21db32924..5ce5069e4 100755
--- a/scripts/deploy-miner.sh
+++ b/scripts/deploy-miner.sh
@@ -2,7 +2,7 @@
 
 HOST=$1
 
-ssh "$HOST" '[ -e ~/.lotusstorage/token ]' && exit 0
+ssh "$HOST" '[ -e ~/.lotusminer/token ]' && exit 0
 
 ssh "$HOST" 'lotus wallet new bls > addr'
 ssh "$HOST" 'curl http://147.75.80.29:777/sendcoll?address=$(cat addr)' &
diff --git a/scripts/deploy-node.sh b/scripts/deploy-node.sh
index 41e8f4a17..fa6efa4d9 100755
--- a/scripts/deploy-node.sh
+++ b/scripts/deploy-node.sh
@@ -23,7 +23,7 @@ set -euo pipefail
 
 systemctl stop lotus-miner
 systemctl stop lotus-daemon
-mkdir -p .lotus .lotusstorage
+mkdir -p .lotus .lotusminer
 
 cd "$HOME/lotus-stage/"
 cp -f lotus lotus-miner /usr/local/bin
diff --git a/scripts/dev/drop-local-repos b/scripts/dev/drop-local-repos
index 939030bad..a0e7a5512 100755
--- a/scripts/dev/drop-local-repos
+++ b/scripts/dev/drop-local-repos
@@ -2,4 +2,4 @@
 
 set -o xtrace
 
-rm -rf ~/.lotus ~/.lotusstorage/ ~/.genesis-sectors ~/.lotusworker
+rm -rf ~/.lotus ~/.lotusminer/ ~/.genesis-sectors ~/.lotusworker
diff --git a/scripts/devnet.bash b/scripts/devnet.bash
index c7fb7b814..96f0263bd 100755
--- a/scripts/devnet.bash
+++ b/scripts/devnet.bash
@@ -51,13 +51,13 @@ EOF
 cat > "${BASEDIR}/scripts/env.fish" <<EOF
 set -x PATH ${BASEDIR}/bin \$PATH
 set -x LOTUS_PATH ${BASEDIR}/.lotus
-set -x LOTUS_MINER_PATH ${BASEDIR}/.lotusstorage
+set -x LOTUS_MINER_PATH ${BASEDIR}/.lotusminer
 EOF
 
 cat > "${BASEDIR}/scripts/env.bash" <<EOF
 export PATH=${BASEDIR}/bin:\$PATH
 export LOTUS_PATH=${BASEDIR}/.lotus
-export LOTUS_MINER_PATH=${BASEDIR}/.lotusstorage
+export LOTUS_MINER_PATH=${BASEDIR}/.lotusminer
 EOF
 
 cat > "${BASEDIR}/scripts/create_miner.bash" <<EOF
@@ -73,11 +73,11 @@ cat > "${BASEDIR}/scripts/pledge_sectors.bash" <<EOF
 
 set -x
 
-while [ ! -d ${BASEDIR}/.lotusstorage ]; do
+while [ ! -d ${BASEDIR}/.lotusminer ]; do
   sleep 5
 done
 
-while [ ! -f ${BASEDIR}/.lotusstorage/api ]; do
+while [ ! -f ${BASEDIR}/.lotusminer/api ]; do
   sleep 5
 done
 
diff --git a/scripts/filebeat.yml b/scripts/filebeat.yml
index 38c9adbc7..e33ca0e87 100644
--- a/scripts/filebeat.yml
+++ b/scripts/filebeat.yml
@@ -4,7 +4,7 @@ filebeat.inputs:
 
 - type: log
   paths:
-    - /root/.lotusstorage/logs
+    - /root/.lotusminer/logs
   fields:
     logzio_codec: json
     token: <API TOKEN>
diff --git a/scripts/quick-network-join.bash b/scripts/quick-network-join.bash
index 9f2520f33..47527db75 100755
--- a/scripts/quick-network-join.bash
+++ b/scripts/quick-network-join.bash
@@ -34,13 +34,13 @@ EOF
 cat > "${BASEDIR}/scripts/env.fish" <<EOF
 set -x PATH ${BASEDIR}/bin \$PATH
 set -x LOTUS_PATH ${BASEDIR}/.lotus
-set -x LOTUS_MINER_PATH ${BASEDIR}/.lotusstorage
+set -x LOTUS_MINER_PATH ${BASEDIR}/.lotusminer
 EOF
 
 cat > "${BASEDIR}/scripts/env.bash" <<EOF
 export PATH=${BASEDIR}/bin:\$PATH
 export LOTUS_PATH=${BASEDIR}/.lotus
-export LOTUS_MINER_PATH=${BASEDIR}/.lotusstorage
+export LOTUS_MINER_PATH=${BASEDIR}/.lotusminer
 EOF
 
 cat > "${BASEDIR}/scripts/create_miner.bash" <<EOF
@@ -68,11 +68,11 @@ cat > "${BASEDIR}/scripts/pledge_sectors.bash" <<EOF
 
 set -x
 
-while [ ! -d ${BASEDIR}/.lotusstorage ]; do
+while [ ! -d ${BASEDIR}/.lotusminer ]; do
   sleep 5
 done
 
-while [ ! -f ${BASEDIR}/.lotusstorage/api ]; do
+while [ ! -f ${BASEDIR}/.lotusminer/api ]; do
   sleep 5
 done