diff --git a/website/source/docs/commands/help.html.md b/website/source/docs/commands/help.html.md
index 4f28e52e9..c21be6dfc 100644
--- a/website/source/docs/commands/help.html.md
+++ b/website/source/docs/commands/help.html.md
@@ -62,7 +62,7 @@ the path pattern. Note that depending on the policy of your auth token,
 you may or may not be able to access certain paths.
 
     ^.*$
-        Pass-through secret storage to the physical backend, allowing you to
+        Pass-through secret storage to the storage backend, allowing you to
         read/write arbitrary data into secret storage.
 ```
 
@@ -85,7 +85,7 @@ $ vault help secret/password
 Request:        password
 Matching Route: ^.*$
 
-Pass-through secret storage to the physical backend, allowing you to
+Pass-through secret storage to the storage backend, allowing you to
 read/write arbitrary data into secret storage.
 
 ## PARAMETERS
diff --git a/website/source/docs/concepts/ha.html.markdown b/website/source/docs/concepts/ha.html.markdown
index cde207592..160e29100 100644
--- a/website/source/docs/concepts/ha.html.markdown
+++ b/website/source/docs/concepts/ha.html.markdown
@@ -10,7 +10,7 @@ description: |-
 
 Vault supports multi-server mode for high availability. This mode protects
 against outages by running multiple Vault servers. High availability mode
-is automatically enabled when using a physical backend that supports it.
+is automatically enabled when using a storage backend that supports it.
 
 You can tell if a backend supports high availability mode ("HA") by
 starting the server and seeing if "(HA available)" is outputted next to
@@ -18,7 +18,7 @@ the backend information. If it is, then HA will begin happening automatically.
 
 To be highly available, Vault elects a leader and does request forwarding to
 the leader. Due to this architecture, HA does not enable increased scalability.
-In general, the bottleneck of Vault is the physical backend itself, not
+In general, the bottleneck of Vault is the storage backend itself, not
 Vault core. For example: to increase scalability of Vault with Consul, you
 would scale Consul instead of Vault.
 
@@ -34,5 +34,4 @@ Currently, the only backend that supports HA is Consul.
 
 If you're interested in implementing another backend or adding HA support
 to another backend, we'd love your contributions. Adding HA support
-requires implementing the `physical.HABackend` interface for the physical
-backend.
+requires implementing the `physical.HABackend` interface for the storage backend.
diff --git a/website/source/docs/config/index.html.md b/website/source/docs/config/index.html.md
index 8d9dd57b8..77c93c16c 100644
--- a/website/source/docs/config/index.html.md
+++ b/website/source/docs/config/index.html.md
@@ -29,8 +29,8 @@ to specify where the configuration is.
 
 ## Reference
 
-* `backend` (required) - Configures the physical backend where Vault data
-  is stored. There are multiple options available for physical backends,
+* `backend` (required) - Configures the storage backend where Vault data
+  is stored. There are multiple options available for storage backends,
   and they're documented below.
 
 * `listener` (required) - Configures how Vault is listening for API requests.
diff --git a/website/source/docs/secrets/index.html.md b/website/source/docs/secrets/index.html.md
index 30a62e9a1..58c2f0a2e 100644
--- a/website/source/docs/secrets/index.html.md
+++ b/website/source/docs/secrets/index.html.md
@@ -22,8 +22,8 @@ any read/write/delete is sent to the secret backend, and the secret
 backend can choose to react to that operation however it sees fit.
 
 For example, the "generic" backend passes through any operation back
-to the configured physical backend for Vault. A "read" turns into a
-"read" of the physical backend at the same path, a "write" turns into
+to the configured storage backend for Vault. A "read" turns into a
+"read" of the storage backend at the same path, a "write" turns into
 a write, etc. This is a lot like a normal filesystem.
 
 The "aws" backend, on the other hand, behaves differently. When you