diff --git a/.github/workflows/samples-rust-server.yaml b/.github/workflows/samples-rust-server.yaml
index cc0574614a3c..7530b82530d6 100644
--- a/.github/workflows/samples-rust-server.yaml
+++ b/.github/workflows/samples-rust-server.yaml
@@ -48,17 +48,22 @@ jobs:
         run: |
           set -e
 
-          # Iterate through each example and test various features
-          for package in $(find . -maxdepth 1 -mindepth 1 -type d)
+          # Iterate through each package and test various features
+          for package in $(find output -maxdepth 1 -mindepth 1 -type d)
           do
+            pushd $package
             # Not all versions have a server example
             if test -f examples/server/main.rs; then
-              cargo build --example server --features="server"
+              cargo build --example ${package##*/}-server --features="server"
+            fi
+            # Not all versions have a client example
+            if test -f examples/client/main.rs; then
+              cargo build --example ${package##*/}-client --features="client"
             fi
             # Test the CLI works if present
             if test -f bin/cli.rs; then
               cargo build --bin ${package##*/} --features cli
-              target/debug/${package##*/} --help
+              ../../target/debug/${package##*/} --help
             fi
             # Test the validate feature if it exists
             if cargo read-manifest | grep -q '"validate"'; then
@@ -77,4 +82,5 @@ jobs:
             cargo test
             cargo clippy
             cargo doc
+            popd
           done
diff --git a/modules/openapi-generator/src/main/resources/rust-server-deprecated/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust-server-deprecated/Cargo.mustache
index 7ea81f12a669..34bd11bf4f6c 100644
--- a/modules/openapi-generator/src/main/resources/rust-server-deprecated/Cargo.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server-deprecated/Cargo.mustache
@@ -167,11 +167,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "{{{packageName}}}-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "{{{packageName}}}-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/modules/openapi-generator/src/main/resources/rust-server-deprecated/README.mustache b/modules/openapi-generator/src/main/resources/rust-server-deprecated/README.mustache
index 3bb4bf7fc648..29be38be40ac 100644
--- a/modules/openapi-generator/src/main/resources/rust-server-deprecated/README.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server-deprecated/README.mustache
@@ -71,20 +71,20 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example {{{packageName}}}-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example {{{packageName}}}-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example {{{packageName}}}-server
 ```
 
 ### Running the example client
@@ -97,7 +97,7 @@ To run a client, follow one of the following simple steps:
       {{#operation}}
         {{#vendorExtensions}}
           {{^x-no-client-example}}
-cargo run --example client {{{operationId}}}
+cargo run --example {{{packageName}}}-client {{{operationId}}}
           {{/x-no-client-example}}
         {{/vendorExtensions}}
       {{/operation}}
@@ -110,7 +110,7 @@ cargo run --example client {{{operationId}}}
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example {{{packageName}}}-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache
index d43d1fe47c2d..7a477edd2dbf 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache
@@ -191,11 +191,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "{{{packageName}}}-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "{{{packageName}}}-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/modules/openapi-generator/src/main/resources/rust-server/README.mustache b/modules/openapi-generator/src/main/resources/rust-server/README.mustache
index 60d2b83e81eb..64dbbf55ff86 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/README.mustache
@@ -71,20 +71,20 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example {{{packageName}}}-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example {{{packageName}}}-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example {{{packageName}}}-server
 ```
 
 ### Running the example client
@@ -97,7 +97,7 @@ To run a client, follow one of the following simple steps:
       {{#operation}}
         {{#exts}}
           {{^x-no-client-example}}
-cargo run --example client {{{operationId}}}
+cargo run --example {{{packageName}}}-client {{{operationId}}}
           {{/x-no-client-example}}
         {{/exts}}
       {{/operation}}
@@ -110,7 +110,7 @@ cargo run --example client {{{operationId}}}
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example {{{packageName}}}-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/Cargo.toml
index 94409b6cbcd0..41c685199a4a 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/Cargo.toml
@@ -93,11 +93,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "multipart-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "multipart-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md
index 0cf02daad524..2a7a06dae7e6 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md
@@ -66,36 +66,36 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example multipart-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example multipart-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example multipart-v3-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client MultipartRelatedRequestPost
-cargo run --example client MultipartRequestPost
-cargo run --example client MultipleIdenticalMimeTypesPost
+cargo run --example multipart-v3-client MultipartRelatedRequestPost
+cargo run --example multipart-v3-client MultipartRequestPost
+cargo run --example multipart-v3-client MultipleIdenticalMimeTypesPost
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example multipart-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/no-example-v3/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/no-example-v3/Cargo.toml
index 97b38209d897..731b3b9524e2 100644
--- a/samples/server/petstore/rust-server-deprecated/output/no-example-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/no-example-v3/Cargo.toml
@@ -83,11 +83,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "no-example-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "no-example-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/no-example-v3/README.md b/samples/server/petstore/rust-server-deprecated/output/no-example-v3/README.md
index e523b8861d8d..a4549d62f32a 100644
--- a/samples/server/petstore/rust-server-deprecated/output/no-example-v3/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/no-example-v3/README.md
@@ -66,20 +66,20 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example no-example-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example no-example-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example no-example-v3-server
 ```
 
 ### Running the example client
@@ -92,7 +92,7 @@ To run a client, follow one of the following simple steps:
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example no-example-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/openapi-v3/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/openapi-v3/Cargo.toml
index d74e1bc72df9..2fa7f751090a 100644
--- a/samples/server/petstore/rust-server-deprecated/output/openapi-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/openapi-v3/Cargo.toml
@@ -89,11 +89,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "openapi-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "openapi-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/openapi-v3/README.md b/samples/server/petstore/rust-server-deprecated/output/openapi-v3/README.md
index 16ffb86a595b..2001fa3b7af3 100644
--- a/samples/server/petstore/rust-server-deprecated/output/openapi-v3/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/openapi-v3/README.md
@@ -66,64 +66,64 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example openapi-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example openapi-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example openapi-v3-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client AnyOfGet
-cargo run --example client CallbackWithHeaderPost
-cargo run --example client ComplexQueryParamGet
-cargo run --example client ExamplesTest
-cargo run --example client FormTest
-cargo run --example client GetWithBooleanParameter
-cargo run --example client JsonComplexQueryParamGet
-cargo run --example client MandatoryRequestHeaderGet
-cargo run --example client MergePatchJsonGet
-cargo run --example client MultigetGet
-cargo run --example client MultipleAuthSchemeGet
-cargo run --example client OneOfGet
-cargo run --example client OverrideServerGet
-cargo run --example client ParamgetGet
-cargo run --example client ReadonlyAuthSchemeGet
-cargo run --example client RegisterCallbackPost
-cargo run --example client RequiredOctetStreamPut
-cargo run --example client ResponsesWithHeadersGet
-cargo run --example client Rfc7807Get
-cargo run --example client TwoFirstLetterHeaders
-cargo run --example client UntypedPropertyGet
-cargo run --example client UuidGet
-cargo run --example client XmlExtraPost
-cargo run --example client XmlOtherPost
-cargo run --example client XmlOtherPut
-cargo run --example client XmlPost
-cargo run --example client XmlPut
-cargo run --example client EnumInPathPathParamGet
-cargo run --example client MultiplePathParamsWithVeryLongPathToTestFormattingPathParamAPathParamBGet
-cargo run --example client CreateRepo
-cargo run --example client GetRepoInfo
+cargo run --example openapi-v3-client AnyOfGet
+cargo run --example openapi-v3-client CallbackWithHeaderPost
+cargo run --example openapi-v3-client ComplexQueryParamGet
+cargo run --example openapi-v3-client ExamplesTest
+cargo run --example openapi-v3-client FormTest
+cargo run --example openapi-v3-client GetWithBooleanParameter
+cargo run --example openapi-v3-client JsonComplexQueryParamGet
+cargo run --example openapi-v3-client MandatoryRequestHeaderGet
+cargo run --example openapi-v3-client MergePatchJsonGet
+cargo run --example openapi-v3-client MultigetGet
+cargo run --example openapi-v3-client MultipleAuthSchemeGet
+cargo run --example openapi-v3-client OneOfGet
+cargo run --example openapi-v3-client OverrideServerGet
+cargo run --example openapi-v3-client ParamgetGet
+cargo run --example openapi-v3-client ReadonlyAuthSchemeGet
+cargo run --example openapi-v3-client RegisterCallbackPost
+cargo run --example openapi-v3-client RequiredOctetStreamPut
+cargo run --example openapi-v3-client ResponsesWithHeadersGet
+cargo run --example openapi-v3-client Rfc7807Get
+cargo run --example openapi-v3-client TwoFirstLetterHeaders
+cargo run --example openapi-v3-client UntypedPropertyGet
+cargo run --example openapi-v3-client UuidGet
+cargo run --example openapi-v3-client XmlExtraPost
+cargo run --example openapi-v3-client XmlOtherPost
+cargo run --example openapi-v3-client XmlOtherPut
+cargo run --example openapi-v3-client XmlPost
+cargo run --example openapi-v3-client XmlPut
+cargo run --example openapi-v3-client EnumInPathPathParamGet
+cargo run --example openapi-v3-client MultiplePathParamsWithVeryLongPathToTestFormattingPathParamAPathParamBGet
+cargo run --example openapi-v3-client CreateRepo
+cargo run --example openapi-v3-client GetRepoInfo
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example openapi-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/ops-v3/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/ops-v3/Cargo.toml
index 3f9de165eabe..1fd69798ef5d 100644
--- a/samples/server/petstore/rust-server-deprecated/output/ops-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/ops-v3/Cargo.toml
@@ -83,11 +83,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "ops-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "ops-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/ops-v3/README.md b/samples/server/petstore/rust-server-deprecated/output/ops-v3/README.md
index 26e02e69a82a..ad2c0630f36a 100644
--- a/samples/server/petstore/rust-server-deprecated/output/ops-v3/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/ops-v3/README.md
@@ -66,70 +66,70 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example ops-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example ops-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example ops-v3-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client Op10Get
-cargo run --example client Op11Get
-cargo run --example client Op12Get
-cargo run --example client Op13Get
-cargo run --example client Op14Get
-cargo run --example client Op15Get
-cargo run --example client Op16Get
-cargo run --example client Op17Get
-cargo run --example client Op18Get
-cargo run --example client Op19Get
-cargo run --example client Op1Get
-cargo run --example client Op20Get
-cargo run --example client Op21Get
-cargo run --example client Op22Get
-cargo run --example client Op23Get
-cargo run --example client Op24Get
-cargo run --example client Op25Get
-cargo run --example client Op26Get
-cargo run --example client Op27Get
-cargo run --example client Op28Get
-cargo run --example client Op29Get
-cargo run --example client Op2Get
-cargo run --example client Op30Get
-cargo run --example client Op31Get
-cargo run --example client Op32Get
-cargo run --example client Op33Get
-cargo run --example client Op34Get
-cargo run --example client Op35Get
-cargo run --example client Op36Get
-cargo run --example client Op37Get
-cargo run --example client Op3Get
-cargo run --example client Op4Get
-cargo run --example client Op5Get
-cargo run --example client Op6Get
-cargo run --example client Op7Get
-cargo run --example client Op8Get
-cargo run --example client Op9Get
+cargo run --example ops-v3-client Op10Get
+cargo run --example ops-v3-client Op11Get
+cargo run --example ops-v3-client Op12Get
+cargo run --example ops-v3-client Op13Get
+cargo run --example ops-v3-client Op14Get
+cargo run --example ops-v3-client Op15Get
+cargo run --example ops-v3-client Op16Get
+cargo run --example ops-v3-client Op17Get
+cargo run --example ops-v3-client Op18Get
+cargo run --example ops-v3-client Op19Get
+cargo run --example ops-v3-client Op1Get
+cargo run --example ops-v3-client Op20Get
+cargo run --example ops-v3-client Op21Get
+cargo run --example ops-v3-client Op22Get
+cargo run --example ops-v3-client Op23Get
+cargo run --example ops-v3-client Op24Get
+cargo run --example ops-v3-client Op25Get
+cargo run --example ops-v3-client Op26Get
+cargo run --example ops-v3-client Op27Get
+cargo run --example ops-v3-client Op28Get
+cargo run --example ops-v3-client Op29Get
+cargo run --example ops-v3-client Op2Get
+cargo run --example ops-v3-client Op30Get
+cargo run --example ops-v3-client Op31Get
+cargo run --example ops-v3-client Op32Get
+cargo run --example ops-v3-client Op33Get
+cargo run --example ops-v3-client Op34Get
+cargo run --example ops-v3-client Op35Get
+cargo run --example ops-v3-client Op36Get
+cargo run --example ops-v3-client Op37Get
+cargo run --example ops-v3-client Op3Get
+cargo run --example ops-v3-client Op4Get
+cargo run --example ops-v3-client Op5Get
+cargo run --example ops-v3-client Op6Get
+cargo run --example ops-v3-client Op7Get
+cargo run --example ops-v3-client Op8Get
+cargo run --example ops-v3-client Op9Get
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example ops-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
index 444dd4b96557..7c95dd77ad12 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
@@ -95,11 +95,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "petstore-with-fake-endpoints-models-for-testing-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "petstore-with-fake-endpoints-models-for-testing-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
index 0584b86c1ef4..2b48f279eccc 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
@@ -66,58 +66,58 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example petstore-with-fake-endpoints-models-for-testing-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example petstore-with-fake-endpoints-models-for-testing-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client Call123example
-cargo run --example client FakeOuterBooleanSerialize
-cargo run --example client FakeOuterCompositeSerialize
-cargo run --example client FakeOuterNumberSerialize
-cargo run --example client FakeOuterStringSerialize
-cargo run --example client FakeResponseWithNumericalDescription
-cargo run --example client TestEndpointParameters
-cargo run --example client TestEnumParameters
-cargo run --example client TestJsonFormData
-cargo run --example client HyphenParam
-cargo run --example client FindPetsByStatus
-cargo run --example client FindPetsByTags
-cargo run --example client DeletePet
-cargo run --example client GetPetById
-cargo run --example client UpdatePetWithForm
-cargo run --example client UploadFile
-cargo run --example client GetInventory
-cargo run --example client DeleteOrder
-cargo run --example client GetOrderById
-cargo run --example client CreateUsersWithArrayInput
-cargo run --example client CreateUsersWithListInput
-cargo run --example client LoginUser
-cargo run --example client LogoutUser
-cargo run --example client DeleteUser
-cargo run --example client GetUserByName
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client Call123example
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterBooleanSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterCompositeSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterNumberSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterStringSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeResponseWithNumericalDescription
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client TestEndpointParameters
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client TestEnumParameters
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client TestJsonFormData
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client HyphenParam
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FindPetsByStatus
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FindPetsByTags
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client DeletePet
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetPetById
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client UpdatePetWithForm
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client UploadFile
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetInventory
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client DeleteOrder
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetOrderById
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client CreateUsersWithArrayInput
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client CreateUsersWithListInput
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client LoginUser
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client LogoutUser
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client DeleteUser
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetUserByName
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example petstore-with-fake-endpoints-models-for-testing-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/Cargo.toml
index e56f964f0bc3..368152925446 100644
--- a/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/Cargo.toml
@@ -83,11 +83,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "ping-bearer-auth-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "ping-bearer-auth-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/README.md b/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/README.md
index ef1584a144c9..3a20518b2119 100644
--- a/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth/README.md
@@ -66,34 +66,34 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example ping-bearer-auth-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example ping-bearer-auth-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example ping-bearer-auth-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client PingGet
+cargo run --example ping-bearer-auth-client PingGet
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example ping-bearer-auth-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server-deprecated/output/rust-server-test/Cargo.toml b/samples/server/petstore/rust-server-deprecated/output/rust-server-test/Cargo.toml
index 997423d90583..bd4588bfdb87 100644
--- a/samples/server/petstore/rust-server-deprecated/output/rust-server-test/Cargo.toml
+++ b/samples/server/petstore/rust-server-deprecated/output/rust-server-test/Cargo.toml
@@ -83,11 +83,13 @@ tokio-openssl = "0.6"
 openssl = "0.10"
 
 [[example]]
-name = "client"
+name = "rust-server-test-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "rust-server-test-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server-deprecated/output/rust-server-test/README.md b/samples/server/petstore/rust-server-deprecated/output/rust-server-test/README.md
index 2104fe4851f0..7a6164d88234 100644
--- a/samples/server/petstore/rust-server-deprecated/output/rust-server-test/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/rust-server-test/README.md
@@ -66,40 +66,40 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example rust-server-test-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example rust-server-test-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example rust-server-test-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client AllOfGet
-cargo run --example client DummyGet
-cargo run --example client FileResponseGet
-cargo run --example client GetStructuredYaml
-cargo run --example client HtmlPost
-cargo run --example client PostYaml
-cargo run --example client RawJsonGet
+cargo run --example rust-server-test-client AllOfGet
+cargo run --example rust-server-test-client DummyGet
+cargo run --example rust-server-test-client FileResponseGet
+cargo run --example rust-server-test-client GetStructuredYaml
+cargo run --example rust-server-test-client HtmlPost
+cargo run --example rust-server-test-client PostYaml
+cargo run --example rust-server-test-client RawJsonGet
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example rust-server-test-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
index f1fff369d76b..6bd59cc408fe 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
@@ -120,11 +120,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "multipart-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "multipart-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/README.md b/samples/server/petstore/rust-server/output/multipart-v3/README.md
index f056c7ba9447..4d0e6e958b4d 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/README.md
+++ b/samples/server/petstore/rust-server/output/multipart-v3/README.md
@@ -66,36 +66,36 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example multipart-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example multipart-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example multipart-v3-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client MultipartRelatedRequestPost
-cargo run --example client MultipartRequestPost
-cargo run --example client MultipleIdenticalMimeTypesPost
+cargo run --example multipart-v3-client MultipartRelatedRequestPost
+cargo run --example multipart-v3-client MultipartRequestPost
+cargo run --example multipart-v3-client MultipleIdenticalMimeTypesPost
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example multipart-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
index d71ad43365b7..933286f014cb 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
@@ -114,11 +114,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "no-example-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "no-example-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/README.md b/samples/server/petstore/rust-server/output/no-example-v3/README.md
index 21043c1ab683..b1f60d7d1fab 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/README.md
+++ b/samples/server/petstore/rust-server/output/no-example-v3/README.md
@@ -66,20 +66,20 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example no-example-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example no-example-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example no-example-v3-server
 ```
 
 ### Running the example client
@@ -92,7 +92,7 @@ To run a client, follow one of the following simple steps:
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example no-example-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
index cec41dc08199..5689cb4ca9e0 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
@@ -120,11 +120,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "openapi-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "openapi-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/README.md b/samples/server/petstore/rust-server/output/openapi-v3/README.md
index 5862ad6acc68..4999c4b9988e 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/README.md
+++ b/samples/server/petstore/rust-server/output/openapi-v3/README.md
@@ -66,64 +66,64 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example openapi-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example openapi-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example openapi-v3-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client AnyOfGet
-cargo run --example client CallbackWithHeaderPost
-cargo run --example client ComplexQueryParamGet
-cargo run --example client ExamplesTest
-cargo run --example client FormTest
-cargo run --example client GetWithBooleanParameter
-cargo run --example client JsonComplexQueryParamGet
-cargo run --example client MandatoryRequestHeaderGet
-cargo run --example client MergePatchJsonGet
-cargo run --example client MultigetGet
-cargo run --example client MultipleAuthSchemeGet
-cargo run --example client OneOfGet
-cargo run --example client OverrideServerGet
-cargo run --example client ParamgetGet
-cargo run --example client ReadonlyAuthSchemeGet
-cargo run --example client RegisterCallbackPost
-cargo run --example client RequiredOctetStreamPut
-cargo run --example client ResponsesWithHeadersGet
-cargo run --example client Rfc7807Get
-cargo run --example client TwoFirstLetterHeaders
-cargo run --example client UntypedPropertyGet
-cargo run --example client UuidGet
-cargo run --example client XmlExtraPost
-cargo run --example client XmlOtherPost
-cargo run --example client XmlOtherPut
-cargo run --example client XmlPost
-cargo run --example client XmlPut
-cargo run --example client EnumInPathPathParamGet
-cargo run --example client MultiplePathParamsWithVeryLongPathToTestFormattingPathParamAPathParamBGet
-cargo run --example client CreateRepo
-cargo run --example client GetRepoInfo
+cargo run --example openapi-v3-client AnyOfGet
+cargo run --example openapi-v3-client CallbackWithHeaderPost
+cargo run --example openapi-v3-client ComplexQueryParamGet
+cargo run --example openapi-v3-client ExamplesTest
+cargo run --example openapi-v3-client FormTest
+cargo run --example openapi-v3-client GetWithBooleanParameter
+cargo run --example openapi-v3-client JsonComplexQueryParamGet
+cargo run --example openapi-v3-client MandatoryRequestHeaderGet
+cargo run --example openapi-v3-client MergePatchJsonGet
+cargo run --example openapi-v3-client MultigetGet
+cargo run --example openapi-v3-client MultipleAuthSchemeGet
+cargo run --example openapi-v3-client OneOfGet
+cargo run --example openapi-v3-client OverrideServerGet
+cargo run --example openapi-v3-client ParamgetGet
+cargo run --example openapi-v3-client ReadonlyAuthSchemeGet
+cargo run --example openapi-v3-client RegisterCallbackPost
+cargo run --example openapi-v3-client RequiredOctetStreamPut
+cargo run --example openapi-v3-client ResponsesWithHeadersGet
+cargo run --example openapi-v3-client Rfc7807Get
+cargo run --example openapi-v3-client TwoFirstLetterHeaders
+cargo run --example openapi-v3-client UntypedPropertyGet
+cargo run --example openapi-v3-client UuidGet
+cargo run --example openapi-v3-client XmlExtraPost
+cargo run --example openapi-v3-client XmlOtherPost
+cargo run --example openapi-v3-client XmlOtherPut
+cargo run --example openapi-v3-client XmlPost
+cargo run --example openapi-v3-client XmlPut
+cargo run --example openapi-v3-client EnumInPathPathParamGet
+cargo run --example openapi-v3-client MultiplePathParamsWithVeryLongPathToTestFormattingPathParamAPathParamBGet
+cargo run --example openapi-v3-client CreateRepo
+cargo run --example openapi-v3-client GetRepoInfo
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example openapi-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
index 2c089f67518e..e0d9734ddba9 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
@@ -114,11 +114,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "ops-v3-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "ops-v3-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/ops-v3/README.md b/samples/server/petstore/rust-server/output/ops-v3/README.md
index 5e5fcc8a327a..65b9d92e8db0 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/README.md
+++ b/samples/server/petstore/rust-server/output/ops-v3/README.md
@@ -66,70 +66,70 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example ops-v3-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example ops-v3-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example ops-v3-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client Op10Get
-cargo run --example client Op11Get
-cargo run --example client Op12Get
-cargo run --example client Op13Get
-cargo run --example client Op14Get
-cargo run --example client Op15Get
-cargo run --example client Op16Get
-cargo run --example client Op17Get
-cargo run --example client Op18Get
-cargo run --example client Op19Get
-cargo run --example client Op1Get
-cargo run --example client Op20Get
-cargo run --example client Op21Get
-cargo run --example client Op22Get
-cargo run --example client Op23Get
-cargo run --example client Op24Get
-cargo run --example client Op25Get
-cargo run --example client Op26Get
-cargo run --example client Op27Get
-cargo run --example client Op28Get
-cargo run --example client Op29Get
-cargo run --example client Op2Get
-cargo run --example client Op30Get
-cargo run --example client Op31Get
-cargo run --example client Op32Get
-cargo run --example client Op33Get
-cargo run --example client Op34Get
-cargo run --example client Op35Get
-cargo run --example client Op36Get
-cargo run --example client Op37Get
-cargo run --example client Op3Get
-cargo run --example client Op4Get
-cargo run --example client Op5Get
-cargo run --example client Op6Get
-cargo run --example client Op7Get
-cargo run --example client Op8Get
-cargo run --example client Op9Get
+cargo run --example ops-v3-client Op10Get
+cargo run --example ops-v3-client Op11Get
+cargo run --example ops-v3-client Op12Get
+cargo run --example ops-v3-client Op13Get
+cargo run --example ops-v3-client Op14Get
+cargo run --example ops-v3-client Op15Get
+cargo run --example ops-v3-client Op16Get
+cargo run --example ops-v3-client Op17Get
+cargo run --example ops-v3-client Op18Get
+cargo run --example ops-v3-client Op19Get
+cargo run --example ops-v3-client Op1Get
+cargo run --example ops-v3-client Op20Get
+cargo run --example ops-v3-client Op21Get
+cargo run --example ops-v3-client Op22Get
+cargo run --example ops-v3-client Op23Get
+cargo run --example ops-v3-client Op24Get
+cargo run --example ops-v3-client Op25Get
+cargo run --example ops-v3-client Op26Get
+cargo run --example ops-v3-client Op27Get
+cargo run --example ops-v3-client Op28Get
+cargo run --example ops-v3-client Op29Get
+cargo run --example ops-v3-client Op2Get
+cargo run --example ops-v3-client Op30Get
+cargo run --example ops-v3-client Op31Get
+cargo run --example ops-v3-client Op32Get
+cargo run --example ops-v3-client Op33Get
+cargo run --example ops-v3-client Op34Get
+cargo run --example ops-v3-client Op35Get
+cargo run --example ops-v3-client Op36Get
+cargo run --example ops-v3-client Op37Get
+cargo run --example ops-v3-client Op3Get
+cargo run --example ops-v3-client Op4Get
+cargo run --example ops-v3-client Op5Get
+cargo run --example ops-v3-client Op6Get
+cargo run --example ops-v3-client Op7Get
+cargo run --example ops-v3-client Op8Get
+cargo run --example ops-v3-client Op9Get
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example ops-v3-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
index bbd471351888..b0d7cfd6979a 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
@@ -124,11 +124,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "petstore-with-fake-endpoints-models-for-testing-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "petstore-with-fake-endpoints-models-for-testing-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
index 76b723f84f12..ed3b82ffe198 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
@@ -66,58 +66,58 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example petstore-with-fake-endpoints-models-for-testing-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example petstore-with-fake-endpoints-models-for-testing-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client Call123example
-cargo run --example client FakeOuterBooleanSerialize
-cargo run --example client FakeOuterCompositeSerialize
-cargo run --example client FakeOuterNumberSerialize
-cargo run --example client FakeOuterStringSerialize
-cargo run --example client FakeResponseWithNumericalDescription
-cargo run --example client TestEndpointParameters
-cargo run --example client TestEnumParameters
-cargo run --example client TestJsonFormData
-cargo run --example client HyphenParam
-cargo run --example client FindPetsByStatus
-cargo run --example client FindPetsByTags
-cargo run --example client DeletePet
-cargo run --example client GetPetById
-cargo run --example client UpdatePetWithForm
-cargo run --example client UploadFile
-cargo run --example client GetInventory
-cargo run --example client DeleteOrder
-cargo run --example client GetOrderById
-cargo run --example client CreateUsersWithArrayInput
-cargo run --example client CreateUsersWithListInput
-cargo run --example client LoginUser
-cargo run --example client LogoutUser
-cargo run --example client DeleteUser
-cargo run --example client GetUserByName
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client Call123example
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterBooleanSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterCompositeSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterNumberSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeOuterStringSerialize
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FakeResponseWithNumericalDescription
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client TestEndpointParameters
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client TestEnumParameters
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client TestJsonFormData
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client HyphenParam
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FindPetsByStatus
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client FindPetsByTags
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client DeletePet
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetPetById
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client UpdatePetWithForm
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client UploadFile
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetInventory
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client DeleteOrder
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetOrderById
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client CreateUsersWithArrayInput
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client CreateUsersWithListInput
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client LoginUser
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client LogoutUser
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client DeleteUser
+cargo run --example petstore-with-fake-endpoints-models-for-testing-client GetUserByName
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example petstore-with-fake-endpoints-models-for-testing-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml b/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml
index 84b62942a497..09535926daff 100644
--- a/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml
@@ -114,11 +114,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "ping-bearer-auth-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "ping-bearer-auth-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/README.md b/samples/server/petstore/rust-server/output/ping-bearer-auth/README.md
index 546eaf3a272e..0caa3c9eca77 100644
--- a/samples/server/petstore/rust-server/output/ping-bearer-auth/README.md
+++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/README.md
@@ -66,34 +66,34 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example ping-bearer-auth-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example ping-bearer-auth-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example ping-bearer-auth-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client PingGet
+cargo run --example ping-bearer-auth-client PingGet
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example ping-bearer-auth-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
index 8c57650539c3..62e70cd87e0e 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
@@ -114,11 +114,13 @@ openssl = "0.10"
 tokio-openssl = "0.6"
 
 [[example]]
-name = "client"
+name = "rust-server-test-client"
+path = "examples/client/main.rs"
 required-features = ["client"]
 
 [[example]]
-name = "server"
+name = "rust-server-test-server"
+path = "examples/server/main.rs"
 required-features = ["server"]
 
 [[bin]]
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/README.md b/samples/server/petstore/rust-server/output/rust-server-test/README.md
index 0dd7947357d8..4fe88d4c0aac 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/README.md
+++ b/samples/server/petstore/rust-server/output/rust-server-test/README.md
@@ -66,40 +66,40 @@ You'll find the binary at `target/release/cli`.
 Run examples with:
 
 ```
-cargo run --example <example-name>
+cargo run --example rust-server-test-<client|server>
 ```
 
 To pass in arguments to the examples, put them after `--`, for example:
 
 ```
-cargo run --example client -- --help
+cargo run --example rust-server-test-client -- --help
 ```
 
 ### Running the example server
 To run the server, follow these simple steps:
 
 ```
-cargo run --example server
+cargo run --example rust-server-test-server
 ```
 
 ### Running the example client
 To run a client, follow one of the following simple steps:
 
 ```
-cargo run --example client AllOfGet
-cargo run --example client DummyGet
-cargo run --example client FileResponseGet
-cargo run --example client GetStructuredYaml
-cargo run --example client HtmlPost
-cargo run --example client PostYaml
-cargo run --example client RawJsonGet
+cargo run --example rust-server-test-client AllOfGet
+cargo run --example rust-server-test-client DummyGet
+cargo run --example rust-server-test-client FileResponseGet
+cargo run --example rust-server-test-client GetStructuredYaml
+cargo run --example rust-server-test-client HtmlPost
+cargo run --example rust-server-test-client PostYaml
+cargo run --example rust-server-test-client RawJsonGet
 ```
 
 ### HTTPS
 The examples can be run in HTTPS mode by passing in the flag `--https`, for example:
 
 ```
-cargo run --example server -- --https
+cargo run --example rust-server-test-server -- --https
 ```
 
 This will use the keys/certificates from the examples directory. Note that the