diff --git a/getting-started/setup-dapr.md b/getting-started/environment-setup.md
similarity index 99%
rename from getting-started/setup-dapr.md
rename to getting-started/environment-setup.md
index 01d9553ac..4c6dc1d5c 100644
--- a/getting-started/setup-dapr.md
+++ b/getting-started/environment-setup.md
@@ -1,4 +1,4 @@
-# Setup Dapr
+# Environment Setup
 
 Dapr can be run in either Standalone or Kubernetes modes. Running Dapr runtime in Standalone mode enables you to develop Dapr applications in your local development environment and then deploy and run them in other Dapr supported environments. For example, you can develop Dapr applications in Standalone mode and then deploy them to any Kubernetes cluster.
 
diff --git a/getting-started/readme.md b/getting-started/readme.md
index 86657f800..290fd56f3 100644
--- a/getting-started/readme.md
+++ b/getting-started/readme.md
@@ -2,9 +2,9 @@
 
 Dapr is a portable, event-driven runtime that makes it easy for enterprise developers to build resilient, microservice stateless and stateful applications that run on the cloud and edge and embraces the diversity of languages and developer frameworks. 
 
-To build and run your Dapr applications, you will need to setup your environments and install Dapr:
+To build and run your Dapr applications, you will need to [setup your environment](./environment-setup.md) and install Dapr:
 
-1. [Setup local development](./setup-dapr.md#prerequisites)
-2. [Setup Kubernetes environment](./setup-dapr.md#installing-dapr-on-a-kubernetes-cluster)
+1. [Setup local development](./environment-setup.md#prerequisites)
+2. [Setup Kubernetes environment](./environment-setup.md#installing-dapr-on-a-kubernetes-cluster)
 
 Once Dapr is installed, you can try out [Hello-World sample](https://github.com/dapr/samples/tree/master/1.hello-world) first and then explore the other [Dapr samples](https://github.com/dapr/samples) to evaluate the [Dapr concepts](../concepts), such as service invocation, state management, pubsub, bindings, etc.