diff --git a/daprdocs/content/en/concepts/dapr-services/sidecar.md b/daprdocs/content/en/concepts/dapr-services/sidecar.md
index e50ce3675..473f001c9 100644
--- a/daprdocs/content/en/concepts/dapr-services/sidecar.md
+++ b/daprdocs/content/en/concepts/dapr-services/sidecar.md
@@ -49,10 +49,10 @@ For a detailed list of all available arguments run `daprd --help` or see this [t
    daprd --app-id --app-port 5000
    ```
 
-3. If you are using several custom components and want to specify the location of the component definition files, use the `--components-path` argument:
+3. If you are using several custom resources and want to specify the location of the resource definition files, use the `--resources-path` argument:
 
    ```bash
-   daprd --app-id myapp --components-path <PATH-TO-COMPONENTS-FILES>
+   daprd --app-id myapp --resources-path <PATH-TO-RESOURCES-FILES>
    ```
 
 4. Enable collection of Prometheus metrics while running your app
diff --git a/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
index d17bb6eae..2f5294044 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
@@ -35,7 +35,7 @@ Create a new binding component named `checkout`. Within the `metadata` section,
 
 {{% codetab %}}
 
-Use the `--components-path` flag with `dapr run` to point to your custom components directory.
+Use the `--resources-path` flag with `dapr run` to point to your custom resources directory.
 
 ```yaml
 apiVersion: dapr.io/v1alpha1
diff --git a/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md
index 6b37300e7..a98cc37ea 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md
@@ -41,7 +41,7 @@ Create a new binding component named `checkout`. Within the `metadata` section,
 
 {{% codetab %}}
 
-Use the `--components-path` flag with the `dapr run` command to point to your custom components directory.
+Use the `--resources-path` flag with the `dapr run` command to point to your custom resources directory.
 
 ```yaml
 apiVersion: dapr.io/v1alpha1
diff --git a/daprdocs/content/en/developing-applications/building-blocks/configuration/howto-manage-configuration.md b/daprdocs/content/en/developing-applications/building-blocks/configuration/howto-manage-configuration.md
index 4de325ba6..af70ae08e 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/configuration/howto-manage-configuration.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/configuration/howto-manage-configuration.md
@@ -304,7 +304,7 @@ asyncio.run(executeConfiguration())
 ```
 
 ```bash
-dapr run --app-id orderprocessing --components-path components/ -- python3 OrderProcessingService.py
+dapr run --app-id orderprocessing --resources-path components/ -- python3 OrderProcessingService.py
 ```
 
 {{% /codetab %}}
diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
index 9a3463eaa..134bf696b 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
@@ -63,14 +63,14 @@ scopes:
   - checkout
 ```
 
-You can override this file with another [pubsub component]({{< ref setup-pubsub >}}) by creating a components directory (in this example, `myComponents`) containing the file and using the flag `--components-path` with the `dapr run` CLI command.
+You can override this file with another [pubsub component]({{< ref setup-pubsub >}}) by creating a components directory (in this example, `myComponents`) containing the file and using the flag `--resources-path` with the `dapr run` CLI command.
 
 {{< tabs Dotnet Java Python Go Javascript >}}
 
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- dotnet run
+dapr run --app-id myapp --resources-path ./myComponents -- dotnet run
 ```
 
 {{% /codetab %}}
@@ -78,7 +78,7 @@ dapr run --app-id myapp --components-path ./myComponents -- dotnet run
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- mvn spring-boot:run
+dapr run --app-id myapp --resources-path ./myComponents -- mvn spring-boot:run
 ```
 
 {{% /codetab %}}
@@ -86,7 +86,7 @@ dapr run --app-id myapp --components-path ./myComponents -- mvn spring-boot:run
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- python3 app.py
+dapr run --app-id myapp --resources-path ./myComponents -- python3 app.py
 ```
 
 {{% /codetab %}}
@@ -94,7 +94,7 @@ dapr run --app-id myapp --components-path ./myComponents -- python3 app.py
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- go run app.go
+dapr run --app-id myapp --resources-path ./myComponents -- go run app.go
 ```
 
 {{% /codetab %}}
@@ -102,7 +102,7 @@ dapr run --app-id myapp --components-path ./myComponents -- go run app.go
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- npm start
+dapr run --app-id myapp --resources-path ./myComponents -- npm start
 ```
 {{% /codetab %}}
 
diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md
index c66088ea0..a176d9402 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md
@@ -47,7 +47,7 @@ When running Dapr, set the YAML component file path to point Dapr to the compone
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- dotnet run
+dapr run --app-id myapp --resources-path ./myComponents -- dotnet run
 ```
 
 {{% /codetab %}}
@@ -55,7 +55,7 @@ dapr run --app-id myapp --components-path ./myComponents -- dotnet run
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- mvn spring-boot:run
+dapr run --app-id myapp --resources-path ./myComponents -- mvn spring-boot:run
 ```
 
 {{% /codetab %}}
@@ -63,7 +63,7 @@ dapr run --app-id myapp --components-path ./myComponents -- mvn spring-boot:run
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- python3 app.py
+dapr run --app-id myapp --resources-path ./myComponents -- python3 app.py
 ```
 
 {{% /codetab %}}
@@ -71,7 +71,7 @@ dapr run --app-id myapp --components-path ./myComponents -- python3 app.py
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- npm start
+dapr run --app-id myapp --resources-path ./myComponents -- npm start
 ```
 
 {{% /codetab %}}
@@ -79,7 +79,7 @@ dapr run --app-id myapp --components-path ./myComponents -- npm start
 {{% codetab %}}
 
 ```bash
-dapr run --app-id myapp --components-path ./myComponents -- go run app.go
+dapr run --app-id myapp --resources-path ./myComponents -- go run app.go
 ```
 
 {{% /codetab %}}
diff --git a/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-state-query-api.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-state-query-api.md
index 0aecc3224..209eda9d0 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-state-query-api.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-state-query-api.md
@@ -96,7 +96,7 @@ docker run -d --rm -p 27017:27017 --name mongodb mongo:5
 Next, start a Dapr application. Refer to the [component configuration file](../query-api-examples/components/mongodb/mongodb.yml), which instructs Dapr to use MongoDB as its state store.
 
 ```bash
-dapr run --app-id demo --dapr-http-port 3500 --components-path query-api-examples/components/mongodb
+dapr run --app-id demo --dapr-http-port 3500 --resources-path query-api-examples/components/mongodb
 ```
 
 Populate the state store with the employee dataset, so you can query it later.
diff --git a/daprdocs/content/en/developing-applications/local-development/ides/vscode/vscode-dapr-extension.md b/daprdocs/content/en/developing-applications/local-development/ides/vscode/vscode-dapr-extension.md
index e80b80239..85dbfe828 100644
--- a/daprdocs/content/en/developing-applications/local-development/ides/vscode/vscode-dapr-extension.md
+++ b/daprdocs/content/en/developing-applications/local-development/ides/vscode/vscode-dapr-extension.md
@@ -33,7 +33,7 @@ To create a dedicated components folder with the default `statestore`, `pubsub`,
 1. Open your application directory in Visual Studio Code
 2. Open the Command Palette with `Ctrl+Shift+P`
 3. Select `Dapr: Scaffold Dapr Components`
-4. Run your application with `dapr run --components-path ./components -- ...`
+4. Run your application with `dapr run --resources-path ./components -- ...`
 
 ### View running Dapr applications
 
diff --git a/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md
index 5c3b8b491..4eef26f5c 100644
--- a/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md
+++ b/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md
@@ -85,7 +85,7 @@ pip3 install -r requirements.txt
 Run the `batch-sdk` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id batch-sdk --app-port 50051 --components-path ../../../components -- python3 app.py
+dapr run --app-id batch-sdk --app-port 50051 --resources-path ../../../components -- python3 app.py
 ```
 
 > **Note**: Since Python3.exe is not defined in Windows, you may need to use `python app.py` instead of `python3 app.py`.
@@ -292,7 +292,7 @@ npm install
 Run the `batch-sdk` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id batch-sdk --app-port 5002 --dapr-http-port 3500 --components-path ../../../components -- node index.js 
+dapr run --app-id batch-sdk --app-port 5002 --dapr-http-port 3500 --resources-path ../../../components -- node index.js 
 ```
 
 The code inside the `process_batch` function is executed every 10 seconds (defined in [`binding-cron.yaml`]({{< ref "#componentsbinding-cronyaml-component-file" >}}) in the `components` directory). The binding trigger looks for a route called via HTTP POST in your Flask application by the Dapr sidecar.
@@ -495,7 +495,7 @@ dotnet build batch.csproj
 Run the `batch-sdk` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id batch-sdk --app-port 7002 --components-path ../../../components -- dotnet run
+dapr run --app-id batch-sdk --app-port 7002 --resources-path ../../../components -- dotnet run
 ```
 
 The code inside the `process_batch` function is executed every 10 seconds (defined in [`binding-cron.yaml`]({{< ref "#componentsbinding-cronyaml-component-file" >}}) in the `components` directory). The binding trigger looks for a route called via HTTP POST in your Flask application by the Dapr sidecar.
@@ -701,7 +701,7 @@ mvn clean install
 Run the `batch-sdk` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id batch-sdk --app-port 8080 --components-path ../../../components -- java -jar target/BatchProcessingService-0.0.1-SNAPSHOT.jar
+dapr run --app-id batch-sdk --app-port 8080 --resources-path ../../../components -- java -jar target/BatchProcessingService-0.0.1-SNAPSHOT.jar
 ```
 
 The code inside the `process_batch` function is executed every 10 seconds (defined in [`binding-cron.yaml`]({{< ref "#componentsbinding-cronyaml-component-file" >}}) in the `components` directory). The binding trigger looks for a route called via HTTP POST in your Flask application by the Dapr sidecar.
@@ -908,7 +908,7 @@ go build .
 Run the `batch-sdk` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id batch-sdk --app-port 6002 --dapr-http-port 3502 --dapr-grpc-port 60002 --components-path ../../../components -- go run .
+dapr run --app-id batch-sdk --app-port 6002 --dapr-http-port 3502 --dapr-grpc-port 60002 --resources-path ../../../components -- go run .
 ```
 
 The code inside the `process_batch` function is executed every 10 seconds (defined in [`binding-cron.yaml`]({{< ref "#componentsbinding-cronyaml-component-file" >}}) in the `components` directory). The binding trigger looks for a route called via HTTP POST in your Flask application by the Dapr sidecar.
diff --git a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md
index 33656b97e..cdc6b559d 100644
--- a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md
+++ b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md
@@ -56,7 +56,7 @@ pip3 install -r requirements.txt
 Run the `order-processor` subscriber service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 5001 -- python3 app.py
+dapr run --app-id order-processor --resources-path ../../../components/ --app-port 5001 -- python3 app.py
 ```
 
 > **Note**: Since Python3.exe is not defined in Windows, you may need to use `python app.py` instead of `python3 app.py`.
@@ -105,7 +105,7 @@ pip3 install -r requirements.txt
 Run the `checkout` publisher service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- python3 app.py
+dapr run --app-id checkout --resources-path ../../../components/ -- python3 app.py
 ```
 
 > **Note**: Since Python3.exe is not defined in Windows, you may need to use `python app.py` instead of `python3 app.py`.
@@ -235,7 +235,7 @@ Verify you have the following files included in the service directory:
 Run the `order-processor` subscriber service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-port 5001 --app-id order-processing --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- npm run start
+dapr run --app-port 5001 --app-id order-processing --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- npm run start
 ```
 
 In the `order-processor` subscriber, we're subscribing to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar.
@@ -267,7 +267,7 @@ Verify you have the following files included in the service directory:
 Run the `checkout` publisher service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- npm run start
+dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --resources-path ../../../components -- npm run start
 ```
 
 In the `checkout` publisher service, we're publishing the orderId message to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. As soon as the service starts, it publishes in a loop:
@@ -389,7 +389,7 @@ dotnet build
 Run the `order-processor` subscriber service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components --app-port 7002 -- dotnet run
+dapr run --app-id order-processor --resources-path ../../../components --app-port 7002 -- dotnet run
 ```
 
 In the `order-processor` subscriber, we're subscribing to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar.
@@ -423,7 +423,7 @@ dotnet build
 Run the `checkout` publisher service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id checkout --components-path ../../../components -- dotnet run
+dapr run --app-id checkout --resources-path ../../../components -- dotnet run
 ```
 
 In the `checkout` publisher, we're publishing the orderId message to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. As soon as the service starts, it publishes in a loop:
@@ -544,7 +544,7 @@ mvn clean install
 Run the `order-processor` subscriber service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-port 8080 --app-id order-processor --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+dapr run --app-port 8080 --app-id order-processor --resources-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 
 In the `order-processor` subscriber, we're subscribing to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar.
@@ -582,7 +582,7 @@ mvn clean install
 Run the `checkout` publisher service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id checkout --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
+dapr run --app-id checkout --resources-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
 
 In the `checkout` publisher, we're publishing the orderId message to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. As soon as the service starts, it publishes in a loop:
@@ -706,7 +706,7 @@ go build .
 Run the `order-processor` subscriber service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-port 6002 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
+dapr run --app-port 6002 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- go run .
 ```
 
 In the `order-processor` subscriber, we're subscribing to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar.
@@ -736,7 +736,7 @@ go build .
 Run the `checkout` publisher service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
+dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --resources-path ../../../components -- go run .
 ```
 
 In the `checkout` publisher, we're publishing the orderId message to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. As soon as the service starts, it publishes in a loop:
diff --git a/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md
index 42772e58d..12f3fc51c 100644
--- a/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md
+++ b/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md
@@ -55,7 +55,7 @@ pip3 install -r requirements.txt
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- python3 app.py
+dapr run --app-id order-processor --resources-path ../../../components/ -- python3 app.py
 ```
 
 > **Note**: Since Python3.exe is not defined in Windows, you may need to use `python app.py` instead of `python3 app.py`.
@@ -164,7 +164,7 @@ npm install
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- npm start
+dapr run --app-id order-processor --resources-path ../../../components/ -- npm start
 ```
 
 #### Behind the scenes
@@ -278,7 +278,7 @@ dotnet build
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- dotnet run
+dapr run --app-id order-processor --resources-path ../../../components/ -- dotnet run
 ```
 
 #### Behind the scenes
@@ -389,7 +389,7 @@ mvn clean install
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+dapr run --app-id order-processor --resources-path ../../../components/ -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 
 #### Behind the scenes
@@ -494,7 +494,7 @@ go build .
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- go run .
+dapr run --app-id order-processor --resources-path ../../../components/ -- go run .
 ```
 
 #### Behind the scenes
diff --git a/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md
index 97a3051d4..b1c75fd07 100644
--- a/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md
+++ b/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md
@@ -51,7 +51,7 @@ pip3 install -r requirements.txt
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- python3 app.py
+dapr run --app-id order-processor --resources-path ../../../components/ -- python3 app.py
 ```
 
 > **Note**: Since Python3.exe is not defined in Windows, you may need to use `python app.py` instead of `python3 app.py`.
@@ -172,7 +172,7 @@ Verify you have the following files included in the service directory:
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- npm run start
+dapr run --app-id order-processor --resources-path ../../../components/ -- npm run start
 ```
 The `order-processor` service writes, reads, and deletes an `orderId` key/value pair to the `statestore` instance [defined in the `statestore.yaml` component]({{< ref "#statestoreyaml-component-file" >}}). As soon as the service starts, it performs a loop.
 
@@ -300,7 +300,7 @@ dotnet build
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ -- dotnet run
+dapr run --app-id order-processor --resources-path ../../../components/ -- dotnet run
 ```
 
 The `order-processor` service writes, reads, and deletes an `orderId` key/value pair to the `statestore` instance [defined in the `statestore.yaml` component]({{< ref "#statestoreyaml-component-file" >}}). As soon as the service starts, it performs a loop.
@@ -419,7 +419,7 @@ mvn clean install
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+dapr run --app-id order-processor --resources-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 
 The `order-processor` service writes, reads, and deletes an `orderId` key/value pair to the `statestore` instance [defined in the `statestore.yaml` component]({{< ref "#statestoreyaml-component-file" >}}). As soon as the service starts, it performs a loop.
@@ -538,7 +538,7 @@ go build .
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components -- go run .
+dapr run --app-id order-processor --resources-path ../../../components -- go run .
 ```
 
 The `order-processor` service writes, reads, and deletes an `orderId` key/value pair to the `statestore` instance [defined in the `statestore.yaml` component]({{< ref "#statestoreyaml-component-file" >}}). As soon as the service starts, it performs a loop.
diff --git a/daprdocs/content/en/getting-started/tutorials/configure-state-pubsub.md b/daprdocs/content/en/getting-started/tutorials/configure-state-pubsub.md
index 49d2522c2..13c86ea49 100644
--- a/daprdocs/content/en/getting-started/tutorials/configure-state-pubsub.md
+++ b/daprdocs/content/en/getting-started/tutorials/configure-state-pubsub.md
@@ -317,9 +317,9 @@ When you run `dapr init`, Dapr creates a default redis `pubsub.yaml` on your loc
 For new component files:
 
 1. Create a new `components` directory in your app folder containing the YAML files.
-1. Provide the path to the `dapr run` command with the flag `--components-path`
+1. Provide the path to the `dapr run` command with the flag `--resources-path`
 
-If you initialized Dapr in [slim mode]({{< ref self-hosted-no-docker.md >}}) (without Docker), you need to manually create the default directory, or always specify a components directory using `--components-path`.
+If you initialized Dapr in [slim mode]({{< ref self-hosted-no-docker.md >}}) (without Docker), you need to manually create the default directory, or always specify a components directory using `--resources-path`.
 
 {{% /codetab %}}
 
diff --git a/daprdocs/content/en/getting-started/tutorials/get-started-component.md b/daprdocs/content/en/getting-started/tutorials/get-started-component.md
index 79ab0f635..9f5d6f6bc 100644
--- a/daprdocs/content/en/getting-started/tutorials/get-started-component.md
+++ b/daprdocs/content/en/getting-started/tutorials/get-started-component.md
@@ -65,7 +65,7 @@ In the above file definition:
 Launch a Dapr sidecar that will listen on port 3500 for a blank application named `myapp`:
 
 ```bash
-dapr run --app-id myapp --dapr-http-port 3500 --components-path ./my-components
+dapr run --app-id myapp --dapr-http-port 3500 --resources-path ./my-components
 ```
 
 {{% alert title="Tip" color="primary" %}}
diff --git a/daprdocs/content/en/operations/components/setup-bindings.md b/daprdocs/content/en/operations/components/setup-bindings.md
index 3af31760c..44d762dd6 100644
--- a/daprdocs/content/en/operations/components/setup-bindings.md
+++ b/daprdocs/content/en/operations/components/setup-bindings.md
@@ -62,7 +62,7 @@ Once you have created the component's YAML file, follow these instructions to ap
 {{< tabs "Self-Hosted" "Kubernetes" >}}
 
 {{% codetab %}}
-To run locally, create a `components` dir containing the YAML file and provide the path to the `dapr run` command with the flag `--components-path`.
+To run locally, create a `components` dir containing the YAML file and provide the path to the `dapr run` command with the flag `--resources-path`.
 {{% /codetab %}}
 
 {{% codetab %}}
diff --git a/daprdocs/content/en/operations/components/setup-secret-store.md b/daprdocs/content/en/operations/components/setup-secret-store.md
index bd4190c2a..001595325 100644
--- a/daprdocs/content/en/operations/components/setup-secret-store.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store.md
@@ -65,7 +65,7 @@ Once you have created the component's YAML file, follow these instructions to ap
 {{< tabs "Self-Hosted" "Kubernetes" >}}
 
 {{% codetab %}}
-To run locally, create a `components` dir containing the YAML file and provide the path to the `dapr run` command with the flag `--components-path`.
+To run locally, create a `components` dir containing the YAML file and provide the path to the `dapr run` command with the flag `--resources-path`.
 {{% /codetab %}}
 
 {{% codetab %}}
diff --git a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
index 503bd039d..3211ac08c 100644
--- a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
+++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
@@ -123,10 +123,10 @@ services:
      "--app-id", "nodeapp",
      "--app-port", "3000",
      "--placement-host-address", "placement:50006", # Dapr's placement service can be reach via the docker DNS entry
-     "--components-path", "./components"
+     "--resources-path", "./components"
      ]
     volumes:
-        - "./components/:/components" # Mount our components folder for the runtime to use. The mounted location must match the --components-path argument.
+        - "./components/:/components" # Mount our components folder for the runtime to use. The mounted location must match the --resources-path argument.
     depends_on:
       - nodeapp
     network_mode: "service:nodeapp" # Attach the nodeapp-dapr service to the nodeapp network namespace
diff --git a/daprdocs/content/en/operations/monitoring/logging/logs.md b/daprdocs/content/en/operations/monitoring/logging/logs.md
index 86fc9c523..c8b6442a7 100644
--- a/daprdocs/content/en/operations/monitoring/logging/logs.md
+++ b/daprdocs/content/en/operations/monitoring/logging/logs.md
@@ -58,7 +58,7 @@ When using the Dapr CLI to run an application, pass the `--log-as-json` option t
 ```sh
 dapr run \
   --app-id orderprocessing \
-  --components-path ./components/ \
+  --resources-path ./components/ \
   --log-as-json \
     -- python3 OrderProcessingService.py
 ```
diff --git a/daprdocs/content/en/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md
index 59bad856a..eedbcb601 100644
--- a/daprdocs/content/en/operations/troubleshooting/common_issues.md
+++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md
@@ -225,7 +225,7 @@ export DAPR_HOST_IP=127.0.0.1
 This is usually due to one of the following issues
 
 - You may have defined the `NAMESPACE` environment variable locally or deployed your components into a different namespace in Kubernetes. Check which namespace your app and the components are deployed to. Read [scoping components to one or more applications]({{< ref "component-scopes.md" >}}) for more information.
-- You may have not provided a `--components-path` with the Dapr `run` commands or not placed your components into the default components folder for your OS. Read [define a component]({{< ref "get-started-component.md" >}}) for more information.
+- You may have not provided a `--resources-path` with the Dapr `run` commands or not placed your components into the default components folder for your OS. Read [define a component]({{< ref "get-started-component.md" >}}) for more information.
 - You may have a syntax issue in component YAML file. Check your component YAML with the component [YAML samples]({{< ref "components.md" >}}).
 
 ## Service invocation is failing and my Dapr service is missing an appId (macOS)
diff --git a/daprdocs/content/en/reference/arguments-annotations-overview.md b/daprdocs/content/en/reference/arguments-annotations-overview.md
index 90acd19ef..5af0a4ed4 100644
--- a/daprdocs/content/en/reference/arguments-annotations-overview.md
+++ b/daprdocs/content/en/reference/arguments-annotations-overview.md
@@ -16,7 +16,8 @@ This table is meant to help users understand the equivalent options for running
 | `--app-id` | `--app-id` | `-i` | `dapr.io/app-id`  | The unique ID of the application. Used for service discovery, state encapsulation and the pub/sub consumer ID |
 | `--app-port` | `--app-port` | `-p` | `dapr.io/app-port` | This parameter tells Dapr which port your application is listening on |
 | `--app-ssl` | `--app-ssl` | | `dapr.io/app-ssl` | Sets the URI scheme of the app to https and attempts an SSL connection |
-| `--components-path`  | `--components-path` | `-d` | not supported | Path for components directory. If empty, components will not be loaded. |
+| `--components-path`  | `--components-path` | `-d` | not supported | **Deprecated** in favor of `--resources-path` |
+| `--resources-path`  | `--resources-path` | `-d` | not supported | Path for components directory. If empty, components will not be loaded. |
 | `--config`  | `--config` | `-c` | `dapr.io/config` | Tells Dapr which Configuration CRD to use |
 | `--control-plane-address` | not supported | | not supported | Address for a Dapr control plane |
 | `--dapr-grpc-port` | `--dapr-grpc-port` | | not supported | gRPC port for the Dapr API to listen on (default "50001") |
diff --git a/daprdocs/content/en/reference/cli/dapr-run.md b/daprdocs/content/en/reference/cli/dapr-run.md
index ef03ae703..995211012 100644
--- a/daprdocs/content/en/reference/cli/dapr-run.md
+++ b/daprdocs/content/en/reference/cli/dapr-run.md
@@ -28,7 +28,8 @@ dapr run [flags] [command]
 | `--app-port`, `-p`             | `APP_PORT`           |                                                                                    | The port your application is listening on                                                            |
 | `--app-protocol`, `-P`         |                      | `http`                                                                             | The protocol Dapr uses to talk to the application. Valid values are: `http` or `grpc` |
 | `--app-ssl`                    |                      | `false`                                                                            | Enable https when Dapr invokes the application                                                       |
-| `--components-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | The path for components directory                                                                  |
+| `--components-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | **Deprecated** in favor of `--resources-path`                                                                  |
+| `--resources-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | The path for components directory                                                                  |
 | `--config`, `-c`               |                      | Linux/Mac: `$HOME/.dapr/config.yaml` <br/>Windows: `%USERPROFILE%\.dapr\config.yaml` | Dapr configuration file                                                                            |
 | `--dapr-grpc-port`             | `DAPR_GRPC_PORT`     | `50001`                                                                            | The gRPC port for Dapr to listen on                                                                  |
 | `--dapr-http-port`             | `DAPR_HTTP_PORT`     | `3500`                                                                             | The HTTP port for Dapr to listen on                                                                  |
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-blobstorage.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-blobstorage.md
index aadc6a5de..f4922097c 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-blobstorage.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-blobstorage.md
@@ -133,7 +133,7 @@ kubectl apply -f azureblob.yaml
 
 ### Running locally
 
-To run locally, create a `components` dir containing the YAML file and provide the path to the `dapr run` command with the flag `--components-path`.
+To run locally, create a `components` dir containing the YAML file and provide the path to the `dapr run` command with the flag `--resources-path`.
 
 This state store creates a blob file in the container and puts raw state inside it.
 
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md
index 12c4de8da..d19c817d3 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md
@@ -360,7 +360,7 @@ Memory Store does not support modules and cannot be used with query.
 
 Next is to start a Dapr application. Refer to this [component configuration file](../../../../developing-applications/building-blocks/state-management/query-api-examples/components/redis/redis.yml), which contains query indexing schemas. Make sure to modify the `redisHost` to reflect the local forwarding port which `redislabs/rejson` uses.
 ```bash
-dapr run --app-id demo --dapr-http-port 3500 --components-path query-api-examples/components/redis
+dapr run --app-id demo --dapr-http-port 3500 --resources-path query-api-examples/components/redis
 ```
 
 Now populate the state store with the employee dataset, so you can then query it later.