diff --git a/README.md b/README.md
index a3103df832d8039674461d0d2e63fc8f21741fca..e045a0d5a4449e1ec3731cf983bd4d131ba1e48a 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Loki differs from Prometheus by focussing on logs instead of metrics, and delive
 
 The [getting started docs](./production/README.md) have instructions on how to install Loki via Docker images, Helm charts, Jsonnet, or from source.
 
-Once you have promtail, Loki, and Grafana running, continue with [our usage docs](./docs/usage.md) on how to query your logs.
+Once you have promtail, Loki, and Grafana running, continue with [our usage docs](./docs/querying.md) on how to query your logs.
 
 ### Documentation
 
diff --git a/cmd/docker-driver/README.md b/cmd/docker-driver/README.md
index 815a71b8e6c0c8f54980555e0020f72d8b281a5b..fb2dba29fe0427a788bfc6446b86dab27858205a 100644
--- a/cmd/docker-driver/README.md
+++ b/cmd/docker-driver/README.md
@@ -105,7 +105,7 @@ Once deployed the Grafana service will be sending logs automatically to Loki.
 
 ## Labels
 
-Loki can received a set of labels along with log line. These labels are used to index log entries and query back logs using [LogQL stream selector](../../docs/usage.md#log-stream-selector).
+Loki can received a set of labels along with log line. These labels are used to index log entries and query back logs using [LogQL stream selector](../../docs/querying.md#log-stream-selector).
 
 By default the Docker driver will add the `filename` where the log is written, the `host` where the log has been generated as well as the `container_name`. Additionally `swarm_stack` and `swarm_service` are added for Docker Swarm deployments.
 
diff --git a/production/README.md b/production/README.md
index 50e51780f65036ef9f435ca3b4e77d9dc668e8a6..55fb703163468129570612c12c0b1733f8c69d70 100644
--- a/production/README.md
+++ b/production/README.md
@@ -37,12 +37,12 @@ It will start containers for promtail, Loki, and Grafana.
    docker-compose up
    ```
 
-1. Grafana should now be available at http://localhost:3000/. Log in with `admin` / `admin` and follow the [steps for configuring the datasource in Grafana](../docs/usage.md), using `http://loki:3100` for the URL field.
+1. Grafana should now be available at http://localhost:3000/. Log in with `admin` / `admin` and follow the [steps for configuring the datasource in Grafana](../docs/querying.md#grafana), using `http://loki:3100` for the URL field.
 
 _Note_: When running locally, promtail starts before loki is ready. This can lead to the error message "Data source connected, but no labels received." After a couple seconds, Promtail will forward all newly created log messages correctly.
 Until this is fixed we recommend [building and running from source](#build-and-run-from-source).
 
-For instructions on how to query Loki, see [our usage docs](../docs/usage.md).
+For instructions on how to query Loki, see [our usage docs](../docs/querying.md).
 
 ## Using Helm to deploy on Kubernetes
 
@@ -107,9 +107,9 @@ Grafana is Loki's UI. To query your logs you need to start Grafana as well:
 $ docker run -ti -p 3000:3000 grafana/grafana:master
 ```
 
-Grafana should now be available at http://localhost:3000/. Follow the [steps for configuring the datasource in Grafana](../docs/usage.md) and set the URL field to `http://host.docker.internal:3100`.
+Grafana should now be available at http://localhost:3000/. Follow the [steps for configuring the datasource in Grafana](../docs/querying.md) and set the URL field to `http://host.docker.internal:3100`.
 
-For instructions on how to use loki, see [our usage docs](../docs/usage.md).
+For instructions on how to use loki, see [our usage docs](../docs/querying.md).
 
 ## Get inspired by our production setup
 
diff --git a/production/helm/README.md b/production/helm/README.md
index 444427188690c86de8960dd524c39813ee57a2dd..cf77f9aac9a2f5e26f09821d79bc80c81f01bdc7 100644
--- a/production/helm/README.md
+++ b/production/helm/README.md
@@ -69,7 +69,7 @@ $ kubectl port-forward --namespace <YOUR-NAMESPACE> service/loki-grafana 3000:80
 ```
 
 Navigate to http://localhost:3000 and login with `admin` and the password output above.
-Then follow the [instructions for adding the loki datasource](/docs/usage.md), using the URL `http://loki:3100/`.
+Then follow the [instructions for adding the loki datasource](/docs/querying.md#grafana), using the URL `http://loki:3100/`.
 
 ## Run Loki behind https ingress