From 2d84b9608f1cdd9a4a79c8c43b5831b32342eb9d Mon Sep 17 00:00:00 2001
From: Xiaobing Zhu <71206407+ZhuXiaoBing-cn@users.noreply.github.com>
Date: Fri, 9 Oct 2020 14:46:31 +0800
Subject: [PATCH] Change groupId to com.azure and artifactId to
 azure-spring-cloud-starter-xxx (#15792)

* Change groupId to com.azure and artifactId to azure-spring-cloud-starter-xxx
---
 eng/jacoco-test-coverage/pom.xml              | 126 +++++------
 eng/versioning/version_client.txt             |  42 ++--
 .../README.md                                 |   8 +-
 .../README.md                                 |   6 +-
 sdk/boms/azure-spring-boot-bom/pom.xml        |   4 +-
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   4 +
 .../README.md                                 |   0
 .../pom.xml                                   |   6 +-
 .../convert/ConvertSampleApplication.java     |   0
 .../src/main/java/sample/convert/User.java    |   0
 .../java/sample/convert/UserRepository.java   |   0
 .../src/main/resources/bootstrap.properties   |   0
 .../CHANGELOG.md                              |   4 +
 .../README.md                                 |   0
 .../pom.xml                                   |   6 +-
 .../convert/ConvertSampleApplication.java     |   0
 .../src/main/java/sample/convert/User.java    |   0
 .../java/sample/convert/UserRepository.java   |   0
 .../src/main/resources/application.properties |   0
 .../CHANGELOG.md                              |   4 +
 .../README.md                                 |   0
 .../pom.xml                                   |   6 +-
 .../com/example/AzureConfigApplication.java   |   0
 .../java/com/example/HelloController.java     |   0
 .../java/com/example/MessageProperties.java   |   0
 .../src/main/resources/bootstrap.yaml         |   0
 .../src/main/resources/data/sample-data.json  |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../java/com/example/CacheApplication.java    |   0
 .../main/java/com/example/WebController.java  |   0
 .../src/main/resources/application.properties |   0
 .../java/com/example/CacheApplicationIT.java  |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../example/EventHubBinderApplication.java    |   0
 .../main/java/com/example/SinkExample.java    |   0
 .../main/java/com/example/SourceExample.java  |   0
 .../src/main/resources/application.properties |   0
 .../example/EventHubBinderApplicationIT.java  |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../EventHubKafkaBinderApplication.java       |   0
 .../main/java/com/example/SinkExample.java    |   0
 .../main/java/com/example/SourceExample.java  |   0
 .../src/main/resources/application.properties |   0
 .../EventHubKafkaBinderApplicationIT.java     |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../java/com/example/CustomProcessor.java     |   0
 .../EventHubMultiBindersApplication.java      |   0
 .../main/java/com/example/SinkExample.java    |   0
 .../main/java/com/example/SourceExample.java  |   0
 .../src/main/resources/application.properties |   0
 .../EventHubMultiBindersApplicationIT.java    |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../example/EventHubOperationApplication.java |   0
 .../main/java/com/example/WebController.java  |   0
 .../src/main/resources/application.properties |   0
 .../EventHubOperationApplicationIT.java       |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.md                                 |   0
 .../pom.xml                                   |   6 +-
 .../com/example/DisabledFeaturesHandler.java  |   0
 .../main/java/com/example/FeatureFilter.java  |   0
 .../example/FeatureFilterConfigurations.java  |   0
 .../example/FeatureManagerWebApplication.java |   0
 .../java/com/example/HelloController.java     |   0
 .../java/com/example/MessageProperties.java   |   0
 .../com/example/TargetingContextAccessor.java |   0
 .../main/java/com/example/TestComponent.java  |   0
 .../com/example/filters/ClientFilter.java     |   0
 .../main/java/com/example/filters/Random.java |   0
 .../src/main/resources/application.yml        |   0
 .../src/main/resources/data/sample-data.yml   |   0
 .../src/main/resources/static/css/main.css    |   0
 .../src/main/resources/templates/BetaA.html   |   0
 .../src/main/resources/templates/BetaB.html   |   0
 .../src/main/resources/templates/privacy.html |   0
 .../src/main/resources/templates/welcome.html |   0
 .../CHANGELOG.md                              |   4 +
 .../README.md                                 |   0
 .../pom.xml                                   |   6 +-
 .../java/com/example/ConsoleApplication.java  |   0
 .../example/FeatureFilterConfigurations.java  |   0
 .../src/main/java/com/example/Random.java     |   0
 .../com/example/TargetingContextAccessor.java |   0
 .../src/main/resources/application.yml        |   0
 .../src/main/resources/data/sample-data.yml   |   0
 .../CHANGELOG.md                              |   4 +
 .../README.md                                 |   0
 .../pom.xml                                   |  12 +-
 .../com/example/MessagingApplication.java     |   0
 .../src/main/java/com/example/User.java       |   0
 .../main/java/com/example/WebController.java  |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../java/com/example/QueueController.java     |   0
 .../ServiceBusOperationApplication.java       |   0
 .../java/com/example/TopicController.java     |   0
 .../src/main/resources/application.properties |   0
 .../ServiceBusOperationApplicationIT.java     |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../ServiceBusQueueBinderApplication.java     |   0
 .../main/java/com/example/SinkExample.java    |   0
 .../main/java/com/example/SourceExample.java  |   0
 .../src/main/resources/application.properties |   0
 .../ServiceBusQueueBinderApplicationIT.java   |   0
 .../resources/application-test.properties     |   0
 .../src/test/resources/logback-test.xml       |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../java/com/example/CustomProcessor.java     |   0
 ...erviceBusQueueMultiBindersApplication.java |   0
 .../main/java/com/example/SinkExample.java    |   0
 .../main/java/com/example/SourceExample.java  |   0
 .../src/main/resources/application.properties |   0
 ...viceBusQueueMultiBindersApplicationIT.java |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../ServiceBusTopicBinderApplication.java     |   0
 .../main/java/com/example/SinkExample.java    |   0
 .../main/java/com/example/SourceExample.java  |   0
 .../src/main/resources/application.properties |   0
 .../ServiceBusTopicBinderApplicationIT.java   |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../StorageQueueOperationApplication.java     |   0
 .../main/java/com/example/WebController.java  |   0
 .../src/main/resources/application.properties |   0
 .../StorageQueueOperationApplicationIT.java   |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../main/java/com/example/BlobController.java |   0
 .../java/com/example/StorageApplication.java  |   0
 .../src/main/resources/application.properties |   0
 .../com/example/StorageApplicationIT.java     |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   3 -
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../EventHubIntegrationApplication.java       |   0
 .../java/com/example/ReceiveController.java   |   0
 .../main/java/com/example/SendController.java |   0
 .../src/main/resources/application.properties |   0
 .../EventHubOperationApplicationIT.java       |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../com/example/QueueReceiveController.java   |   0
 .../java/com/example/QueueSendController.java |   0
 .../ServiceBusIntegrationApplication.java     |   0
 .../com/example/TopicReceiveController.java   |   0
 .../java/com/example/TopicSendController.java |   0
 .../src/main/resources/application.properties |   0
 .../ServiceBusIntegrationApplicationIT.java   |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   4 +
 .../README.adoc                               |   0
 .../pom.xml                                   |  12 +-
 .../java/com/example/ReceiveController.java   |   0
 .../main/java/com/example/SendController.java |   0
 .../StorageQueueIntegrationApplication.java   |   0
 .../src/main/resources/application.properties |   0
 .../StorageQueueIntegrationApplicationIT.java |   0
 .../resources/application-test.properties     |   0
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  22 +-
 .../azure-spring-cloud-autoconfigure/pom.xml  |  40 ++--
 .../azure-spring-cloud-context/CHANGELOG.md   |   2 +-
 .../azure-spring-cloud-context/README.md      |   8 +-
 sdk/spring/azure-spring-cloud-context/pom.xml |  13 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  12 +-
 .../pom.xml                                   |  19 +-
 .../azure-spring-cloud-messaging/CHANGELOG.md |   2 +-
 .../azure-spring-cloud-messaging/pom.xml      |  20 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  16 +-
 .../pom.xml                                   |  19 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  14 +-
 .../pom.xml                                   |  20 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  16 +-
 .../pom.xml                                   |  19 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  10 +-
 .../azure-spring-cloud-starter-cache/pom.xml  |  13 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  10 +-
 .../pom.xml                                   |  20 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  10 +-
 .../pom.xml                                   |  40 +---
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  12 +-
 .../pom.xml                                   |  20 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  10 +-
 .../pom.xml                                   |  40 +---
 .../azure-spring-cloud-storage/CHANGELOG.md   |   2 +-
 .../azure-spring-cloud-storage/README.md      |  10 +-
 sdk/spring/azure-spring-cloud-storage/pom.xml |  20 +-
 .../CHANGELOG.md                              |   2 +-
 .../pom.xml                                   |  14 +-
 .../azure-spring-cloud-telemetry/CHANGELOG.md |   2 +-
 .../azure-spring-cloud-telemetry/pom.xml      |   6 +-
 .../azure-spring-cloud-test-eventhubs/pom.xml |   7 +-
 .../azure-spring-cloud-test-storage/pom.xml   |   7 +-
 .../CHANGELOG.md                              |   2 +-
 .../azure-spring-integration-core/pom.xml     |  13 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  10 +-
 .../pom.xml                                   |  36 +--
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  12 +-
 .../pom.xml                                   |  19 +-
 .../CHANGELOG.md                              |   2 +-
 .../README.md                                 |  10 +-
 .../pom.xml                                   |  36 +--
 .../CHANGELOG.md                              |   2 +-
 .../azure-spring-integration-test/pom.xml     |  13 +-
 .../azure-spring-starter-storage/CHANGELOG.md |   2 +-
 .../azure-spring-starter-storage/README.md    |  10 +-
 .../azure-spring-starter-storage/pom.xml      |  13 +-
 sdk/spring/ci.yml                             | 206 +++++++++---------
 sdk/spring/pom.xml                            |  40 ++--
 271 files changed, 706 insertions(+), 777 deletions(-)
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/CHANGELOG.md
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-complete => azure-spring-cloud-sample-appconfiguration-conversion-complete}/README.md (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-complete => azure-spring-cloud-sample-appconfiguration-conversion-complete}/pom.xml (92%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-complete => azure-spring-cloud-sample-appconfiguration-conversion-complete}/src/main/java/sample/convert/ConvertSampleApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-complete => azure-spring-cloud-sample-appconfiguration-conversion-complete}/src/main/java/sample/convert/User.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-complete => azure-spring-cloud-sample-appconfiguration-conversion-complete}/src/main/java/sample/convert/UserRepository.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-complete => azure-spring-cloud-sample-appconfiguration-conversion-complete}/src/main/resources/bootstrap.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-initial => azure-spring-cloud-sample-appconfiguration-conversion-initial}/README.md (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-initial => azure-spring-cloud-sample-appconfiguration-conversion-initial}/pom.xml (92%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-initial => azure-spring-cloud-sample-appconfiguration-conversion-initial}/src/main/java/sample/convert/ConvertSampleApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-initial => azure-spring-cloud-sample-appconfiguration-conversion-initial}/src/main/java/sample/convert/User.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-initial => azure-spring-cloud-sample-appconfiguration-conversion-initial}/src/main/java/sample/convert/UserRepository.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-conversion-sample-initial => azure-spring-cloud-sample-appconfiguration-conversion-initial}/src/main/resources/application.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/README.md (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/pom.xml (92%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/src/main/java/com/example/AzureConfigApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/src/main/java/com/example/HelloController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/src/main/java/com/example/MessageProperties.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/src/main/resources/bootstrap.yaml (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-appconfiguration-sample => azure-spring-cloud-sample-appconfiguration}/src/main/resources/data/sample-data.json (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/pom.xml (86%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/src/main/java/com/example/CacheApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/src/main/java/com/example/WebController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/src/test/java/com/example/CacheApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-cache-sample => azure-spring-cloud-sample-cache}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/pom.xml (86%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/src/main/java/com/example/EventHubBinderApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/src/main/java/com/example/SinkExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/src/main/java/com/example/SourceExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/src/test/java/com/example/EventHubBinderApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-binder-sample => azure-spring-cloud-sample-eventhubs-binder}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/pom.xml (85%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/src/main/java/com/example/EventHubKafkaBinderApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/src/main/java/com/example/SinkExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/src/main/java/com/example/SourceExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/src/test/java/com/example/EventHubKafkaBinderApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-kafka-sample => azure-spring-cloud-sample-eventhubs-kafka}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/pom.xml (86%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/main/java/com/example/CustomProcessor.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/main/java/com/example/EventHubMultiBindersApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/main/java/com/example/SinkExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/main/java/com/example/SourceExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/test/java/com/example/EventHubMultiBindersApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-multibinders-sample => azure-spring-cloud-sample-eventhubs-multibinders}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-cloud-sample-eventhubs-operation}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-cloud-sample-eventhubs-operation}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-cloud-sample-eventhubs-operation}/src/main/java/com/example/EventHubOperationApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-cloud-sample-eventhubs-operation}/src/main/java/com/example/WebController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-cloud-sample-eventhubs-operation}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-cloud-sample-eventhubs-operation}/src/test/java/com/example/EventHubOperationApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-cloud-sample-eventhubs-operation}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/README.md (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/pom.xml (93%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/DisabledFeaturesHandler.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/FeatureFilter.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/FeatureFilterConfigurations.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/FeatureManagerWebApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/HelloController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/MessageProperties.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/TargetingContextAccessor.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/TestComponent.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/filters/ClientFilter.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/java/com/example/filters/Random.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/application.yml (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/data/sample-data.yml (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/static/css/main.css (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/templates/BetaA.html (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/templates/BetaB.html (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/templates/privacy.html (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management-web}/src/main/resources/templates/welcome.html (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/README.md (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/pom.xml (92%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/src/main/java/com/example/ConsoleApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/src/main/java/com/example/FeatureFilterConfigurations.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/src/main/java/com/example/Random.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/src/main/java/com/example/TargetingContextAccessor.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-sample => azure-spring-cloud-sample-feature-management}/src/main/resources/application.yml (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-feature-management-web-sample => azure-spring-cloud-sample-feature-management}/src/main/resources/data/sample-data.yml (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-messaging-sample => azure-spring-cloud-sample-messaging}/README.md (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-messaging-sample => azure-spring-cloud-sample-messaging}/pom.xml (85%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-messaging-sample => azure-spring-cloud-sample-messaging}/src/main/java/com/example/MessagingApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-messaging-sample => azure-spring-cloud-sample-messaging}/src/main/java/com/example/User.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-messaging-sample => azure-spring-cloud-sample-messaging}/src/main/java/com/example/WebController.java (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-cloud-sample-servicebus-operation}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-cloud-sample-servicebus-operation}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-cloud-sample-servicebus-operation}/src/main/java/com/example/QueueController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-cloud-sample-servicebus-operation}/src/main/java/com/example/ServiceBusOperationApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-cloud-sample-servicebus-operation}/src/main/java/com/example/TopicController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-cloud-sample-servicebus-operation}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-cloud-sample-servicebus-operation}/src/test/java/com/example/ServiceBusOperationApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-cloud-sample-servicebus-operation}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/main/java/com/example/ServiceBusQueueBinderApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/main/java/com/example/SinkExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/main/java/com/example/SourceExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/test/java/com/example/ServiceBusQueueBinderApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/test/resources/application-test.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-binder-sample => azure-spring-cloud-sample-servicebus-queue-binder}/src/test/resources/logback-test.xml (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/main/java/com/example/CustomProcessor.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/main/java/com/example/ServiceBusQueueMultiBindersApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/main/java/com/example/SinkExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/main/java/com/example/SourceExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/test/java/com/example/ServiceBusQueueMultiBindersApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-queue-multibinders-sample => azure-spring-cloud-sample-servicebus-queue-multibinders}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/src/main/java/com/example/ServiceBusTopicBinderApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/src/main/java/com/example/SinkExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/src/main/java/com/example/SourceExample.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/src/test/java/com/example/ServiceBusTopicBinderApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-topic-binder-sample => azure-spring-cloud-sample-servicebus-topic-binder}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-cloud-sample-storage-queue-operation}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-cloud-sample-storage-queue-operation}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-cloud-sample-storage-queue-operation}/src/main/java/com/example/StorageQueueOperationApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-cloud-sample-storage-queue-operation}/src/main/java/com/example/WebController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-cloud-sample-storage-queue-operation}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-cloud-sample-storage-queue-operation}/src/test/java/com/example/StorageQueueOperationApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-cloud-sample-storage-queue-operation}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/pom.xml (85%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/src/main/java/com/example/BlobController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/src/main/java/com/example/StorageApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/src/test/java/com/example/StorageApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-resource-sample => azure-spring-cloud-sample-storage-resource}/src/test/resources/application-test.properties (100%)
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/CHANGELOG.md
 delete mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/CHANGELOG.md
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/src/main/java/com/example/EventHubIntegrationApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/src/main/java/com/example/ReceiveController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/src/main/java/com/example/SendController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-integration-sample => azure-spring-integration-sample-eventhubs}/src/test/java/com/example/EventHubOperationApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-eventhubs-operation-sample => azure-spring-integration-sample-eventhubs}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/pom.xml (84%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/src/main/java/com/example/QueueReceiveController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/src/main/java/com/example/QueueSendController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/src/main/java/com/example/ServiceBusIntegrationApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/src/main/java/com/example/TopicReceiveController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/src/main/java/com/example/TopicSendController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-integration-sample-servicebus}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-integration-sample => azure-spring-integration-sample-servicebus}/src/test/java/com/example/ServiceBusIntegrationApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-servicebus-operation-sample => azure-spring-integration-sample-servicebus}/src/test/resources/application-test.properties (100%)
 create mode 100644 sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/CHANGELOG.md
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/README.adoc (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/pom.xml (85%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/src/main/java/com/example/ReceiveController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/src/main/java/com/example/SendController.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/src/main/java/com/example/StorageQueueIntegrationApplication.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-operation-sample => azure-spring-integration-sample-storage-queue}/src/main/resources/application.properties (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/src/test/java/com/example/StorageQueueIntegrationApplicationIT.java (100%)
 rename sdk/spring/azure-spring-boot-samples/{azure-spring-cloud-storage-queue-integration-sample => azure-spring-integration-sample-storage-queue}/src/test/resources/application-test.properties (100%)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 234d8cb6aef59..5f7f96c6d5bab 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -414,54 +414,54 @@
       <version>2.3.1-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-gremlin;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-telemetry</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-telemetry;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-telemetry</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-telemetry;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-test;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-eventhubs;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-servicebus;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-storage-queue</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-storage-queue;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-storage-queue</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-storage-queue;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-storage;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-messaging</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-messaging;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-messaging</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-messaging;current} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -469,59 +469,59 @@
       <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-starter-azure-cache</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-starter-azure-cache;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-cache</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-cache;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs-kafka</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs-kafka;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs-kafka;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-servicebus;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-starter-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-starter-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-starter-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-starter-storage;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-storage-queue</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-storage-queue;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-storage-queue;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-stream-binder-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-stream-binder-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-stream-binder-core;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-stream-binder-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-stream-binder-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-stream-binder-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-stream-binder-test;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-topic-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-topic-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-topic-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-topic-stream-binder;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-queue-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-queue-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-queue-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-queue-stream-binder;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-eventhubs-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-eventhubs-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-eventhubs-stream-binder;current} -->
     </dependency>
   </dependencies>
   <build>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index ee8ecdbce9458..bb0a978659bdc 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -105,27 +105,27 @@ com.azure:azure-spring-boot-starter-metrics;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-spring-boot-starter-servicebus-jms;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-spring-boot-starter;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-spring-boot;3.0.0-beta.1;3.0.0-beta.1
-com.microsoft.azure:spring-cloud-azure-autoconfigure;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-context;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-messaging;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-servicebus-queue-stream-binder;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-servicebus-topic-stream-binder;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-storage;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-stream-binder-test;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-azure-telemetry;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-starter-azure-eventhubs-kafka;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-starter-azure-eventhubs;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-starter-azure-servicebus;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-cloud-starter-azure-storage-queue;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-integration-azure-core;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-integration-azure-test;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-integration-eventhubs;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-integration-servicebus;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-integration-storage-queue;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-starter-azure-cache;1.2.8;1.3.0-beta.1
-com.microsoft.azure:spring-starter-azure-storage;1.2.8;1.3.0-beta.1
+com.azure:azure-spring-cloud-autoconfigure;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-context;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-eventhubs-stream-binder;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-messaging;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-servicebus-queue-stream-binder;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-servicebus-stream-binder-core;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-servicebus-topic-stream-binder;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-starter-cache;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-starter-eventhubs-kafka;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-starter-eventhubs;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-starter-servicebus;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-starter-storage-queue;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-storage;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-stream-binder-test;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-cloud-telemetry;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-integration-core;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-integration-eventhubs;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-integration-servicebus;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-integration-storage-queue;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-integration-test;2.0.0-beta.1;2.0.0-beta.1
+com.azure:azure-spring-starter-storage;2.0.0-beta.1;2.0.0-beta.1
 com.microsoft.azure:spring-cloud-azure-appconfiguration-config-web;1.2.8-beta.1;1.2.8-beta.1
 com.microsoft.azure:spring-cloud-azure-appconfiguration-config;1.2.8-beta.1;1.2.8-beta.1
 com.microsoft.azure:spring-cloud-azure-feature-management-web;1.2.8-beta.1;1.2.8-beta.1
diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/README.md b/sdk/appconfiguration/azure-spring-cloud-feature-management/README.md
index 01501059204af..ed4282e922127 100644
--- a/sdk/appconfiguration/azure-spring-cloud-feature-management/README.md
+++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/README.md
@@ -235,9 +235,9 @@ The following steps demonstrate an example of a progressive rollout for a new 'B
 
 #### Targeting in an Application
 
-An example web application that uses the targeting feature filter is available in the [example project](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample).
+An example web application that uses the targeting feature filter is available in the [example project][example_project].
 
-To begin using the `TargetingFilter` in an application it must be added as a `@Bean` like any other Feature Filter. `TargetingFilter` relies on another `@Bean` to be added to the application, [`ITargetingContextAccessor`](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/TargetingContextAccessor.java). The `ITargetingContextAccessor` allows for defining the current `TargetingContext` to be used for defining the current user id and groups. An example of this is:
+To begin using the `TargetingFilter` in an application it must be added as a `@Bean` like any other Feature Filter. `TargetingFilter` relies on another `@Bean` to be added to the application, [`ITargetingContextAccessor`][ITargetingContextAccessor]. The `ITargetingContextAccessor` allows for defining the current `TargetingContext` to be used for defining the current user id and groups. An example of this is:
 
 ```java
 public class TargetingContextAccessor implements ITargetingContextAccessor {
@@ -272,3 +272,7 @@ Options are available to customize how targeting evaluation is performed across
 ## Troubleshooting
 ## Next steps
 ## Contributing
+
+<!-- Links -->
+[example_project]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web
+[ITargetingContextAccessor]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/TargetingContextAccessor.java
diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/README.md b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/README.md
index ceb12ac6b3bfa..5d1a9cff53379 100644
--- a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/README.md
+++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/README.md
@@ -295,9 +295,9 @@ Please follow [instructions here][contributing_md] to build from source or contr
 <!-- Link -->
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-azure-appconfiguration-config
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-starter-azure-appconfiguration-config
-[app_configuration_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample
-[app_configuration_conversation_complete_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete
-[app_configuration_conversation_initail_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial
+[app_configuration_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration
+[app_configuration_conversation_complete_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete
+[app_configuration_conversation_initail_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/boms/azure-spring-boot-bom/pom.xml b/sdk/boms/azure-spring-boot-bom/pom.xml
index 689b06e6ed09a..c1e8b75c4c7cb 100644
--- a/sdk/boms/azure-spring-boot-bom/pom.xml
+++ b/sdk/boms/azure-spring-boot-bom/pom.xml
@@ -98,8 +98,8 @@
         <version>${azure.spring.boot.integration.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>spring-starter-azure-storage</artifactId>
+        <groupId>com.azure</groupId>
+      <artifactId>azure-spring-starter-storage</artifactId>
         <version>${azure.spring.boot.storage.integration.version}</version>
       </dependency>
     </dependencies>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/README.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/README.md
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/README.md
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/README.md
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/pom.xml
similarity index 92%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/pom.xml
index d2cde63eeaddd..02c9864e01d73 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>spring-cloud-azure-appconfiguration-convert-sample-complete</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-appconfiguration-convert-sample-complete;current} -->
+  <artifactId>azure-spring-cloud-sample-appconfiguration-convert-complete</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-appconfiguration-convert-complete;current} -->
   <name>Azure Spring Cloud App Configuration Conversion Sample</name>
   <description>Sample project to show conversion to Azure App Configuration</description>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/java/sample/convert/ConvertSampleApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/java/sample/convert/ConvertSampleApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/java/sample/convert/ConvertSampleApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/java/sample/convert/ConvertSampleApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/java/sample/convert/User.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/java/sample/convert/User.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/java/sample/convert/User.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/java/sample/convert/User.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/java/sample/convert/UserRepository.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/java/sample/convert/UserRepository.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/java/sample/convert/UserRepository.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/java/sample/convert/UserRepository.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/resources/bootstrap.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/resources/bootstrap.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete/src/main/resources/bootstrap.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete/src/main/resources/bootstrap.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/README.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/README.md
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/README.md
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/README.md
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/pom.xml
similarity index 92%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/pom.xml
index bb664d7db2dee..c1bd98ca5de68 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>azure-appconfiguration-convert-sample-initial</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-appconfiguration-convert-sample-initial;current} -->
+  <artifactId>azure-spring-cloud-sample-appconfiguration-convert-initial</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-appconfiguration-convert-initial;current} -->
   <name>Azure Spring Cloud App Configuration Conversion Sample</name>
   <description>Sample project to show conversion to Azure App Configuration</description>
 
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/java/sample/convert/ConvertSampleApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/java/sample/convert/ConvertSampleApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/java/sample/convert/ConvertSampleApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/java/sample/convert/ConvertSampleApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/java/sample/convert/User.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/java/sample/convert/User.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/java/sample/convert/User.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/java/sample/convert/User.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/java/sample/convert/UserRepository.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/java/sample/convert/UserRepository.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/java/sample/convert/UserRepository.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/java/sample/convert/UserRepository.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/README.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/README.md
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/README.md
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/README.md
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/pom.xml
similarity index 92%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/pom.xml
index 7631baca23a54..4161ce8c30bea 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>azure-appconfiguration-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-appconfiguration-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-appconfiguration</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-appconfiguration;current} -->
   <name>Azure Spring Cloud App Configuration Sample</name>
 
   <dependencyManagement>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/java/com/example/AzureConfigApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/java/com/example/AzureConfigApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/java/com/example/AzureConfigApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/java/com/example/AzureConfigApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/java/com/example/HelloController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/java/com/example/HelloController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/java/com/example/HelloController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/java/com/example/HelloController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/java/com/example/MessageProperties.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/java/com/example/MessageProperties.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/java/com/example/MessageProperties.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/java/com/example/MessageProperties.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/resources/bootstrap.yaml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/resources/bootstrap.yaml
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/resources/bootstrap.yaml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/resources/bootstrap.yaml
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/resources/data/sample-data.json b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/resources/data/sample-data.json
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample/src/main/resources/data/sample-data.json
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration/src/main/resources/data/sample-data.json
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml
similarity index 86%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml
index b272100cb4665..b0cc4041e2887 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>cache-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:cache-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-cache</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-cache;current} -->
   <name>Azure Spring Cloud Cache Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-starter-azure-cache</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-starter-azure-cache;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-cache</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-cache;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/main/java/com/example/CacheApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/main/java/com/example/CacheApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/main/java/com/example/CacheApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/main/java/com/example/CacheApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/main/java/com/example/WebController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/main/java/com/example/WebController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/main/java/com/example/WebController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/main/java/com/example/WebController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/test/java/com/example/CacheApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/test/java/com/example/CacheApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/test/java/com/example/CacheApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/test/java/com/example/CacheApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml
similarity index 86%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml
index cd15d4bddd4b7..f07c40266a820 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>eventhubs-binder-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:eventhubs-binder-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-eventhubs-binder</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-eventhubs-binder;current} -->
   <name>Azure Spring Cloud Event Hub Binder Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-eventhubs-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-eventhubs-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-eventhubs-stream-binder;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/java/com/example/EventHubBinderApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/java/com/example/EventHubBinderApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/java/com/example/EventHubBinderApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/java/com/example/EventHubBinderApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/java/com/example/SinkExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/java/com/example/SinkExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/java/com/example/SinkExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/java/com/example/SinkExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/java/com/example/SourceExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/java/com/example/SourceExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/java/com/example/SourceExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/java/com/example/SourceExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/test/java/com/example/EventHubBinderApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/java/com/example/EventHubBinderApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/test/java/com/example/EventHubBinderApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/java/com/example/EventHubBinderApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml
similarity index 85%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml
index 73e462f1b5eb7..4106bf7879ff1 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>eventhubs-kafka-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:eventhubs-kafka-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-eventhubs-kafka</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-eventhubs-kafka;current} -->
   <name>Azure Spring Cloud Event Hub using Kafka Binder Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs-kafka</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs-kafka;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs-kafka;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/java/com/example/EventHubKafkaBinderApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/java/com/example/EventHubKafkaBinderApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/java/com/example/EventHubKafkaBinderApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/java/com/example/EventHubKafkaBinderApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/java/com/example/SinkExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/java/com/example/SinkExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/java/com/example/SinkExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/java/com/example/SinkExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/java/com/example/SourceExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/java/com/example/SourceExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/java/com/example/SourceExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/java/com/example/SourceExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/test/java/com/example/EventHubKafkaBinderApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/java/com/example/EventHubKafkaBinderApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/test/java/com/example/EventHubKafkaBinderApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/java/com/example/EventHubKafkaBinderApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml
similarity index 86%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml
index 9d182a07dc7ae..9875bdaf6267e 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>eventhubs-multibinders-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:eventhubs-multibinders-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-eventhubs-multibinders</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-eventhubs-multibinders;current} -->
   <name>Azure Spring Cloud Event Hub Multiple Binders Sample</name>
 
   <dependencyManagement>
@@ -33,9 +33,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-eventhubs-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-eventhubs-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-eventhubs-stream-binder;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/CustomProcessor.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/CustomProcessor.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/CustomProcessor.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/CustomProcessor.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/EventHubMultiBindersApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/EventHubMultiBindersApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/EventHubMultiBindersApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/EventHubMultiBindersApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/SinkExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/SinkExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/SinkExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/SinkExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/SourceExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/SourceExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/java/com/example/SourceExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/java/com/example/SourceExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/test/java/com/example/EventHubMultiBindersApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/test/java/com/example/EventHubMultiBindersApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/test/java/com/example/EventHubMultiBindersApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/test/java/com/example/EventHubMultiBindersApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/CHANGELOG.md
new file mode 100644
index 0000000000000..20e5e46ec3f73
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0  (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml
index 0d63bb9a81f5c..46b8f1e9e3d75 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>eventhubs-operation-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:eventhubs-operation-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-eventhubs-operation</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-eventhubs-operation;current} -->
   <name>Azure Spring Cloud Event Hub Operation Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/main/java/com/example/EventHubOperationApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/main/java/com/example/EventHubOperationApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/main/java/com/example/EventHubOperationApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/main/java/com/example/EventHubOperationApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/main/java/com/example/WebController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/main/java/com/example/WebController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/main/java/com/example/WebController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/main/java/com/example/WebController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/test/java/com/example/EventHubOperationApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/test/java/com/example/EventHubOperationApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/test/java/com/example/EventHubOperationApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/test/java/com/example/EventHubOperationApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/README.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/README.md
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/README.md
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/README.md
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/pom.xml
similarity index 93%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/pom.xml
index a8e4cbf161857..4a02c8d068d17 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>feature-management-web-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:feature-management-web-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-feature-management-web</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-feature-management-web;current} -->
   <name>Azure Spring Cloud Feature Management Web Sample</name>
 
   <dependencyManagement>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/DisabledFeaturesHandler.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/DisabledFeaturesHandler.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/DisabledFeaturesHandler.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/DisabledFeaturesHandler.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/FeatureFilter.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/FeatureFilter.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/FeatureFilter.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/FeatureFilter.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/FeatureFilterConfigurations.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/FeatureFilterConfigurations.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/FeatureFilterConfigurations.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/FeatureFilterConfigurations.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/FeatureManagerWebApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/FeatureManagerWebApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/FeatureManagerWebApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/FeatureManagerWebApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/HelloController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/HelloController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/HelloController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/HelloController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/MessageProperties.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/MessageProperties.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/MessageProperties.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/MessageProperties.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/TargetingContextAccessor.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/TargetingContextAccessor.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/TargetingContextAccessor.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/TargetingContextAccessor.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/TestComponent.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/TestComponent.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/TestComponent.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/TestComponent.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/filters/ClientFilter.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/filters/ClientFilter.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/filters/ClientFilter.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/filters/ClientFilter.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/filters/Random.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/filters/Random.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/java/com/example/filters/Random.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/java/com/example/filters/Random.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/application.yml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/application.yml
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/application.yml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/application.yml
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/resources/data/sample-data.yml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/data/sample-data.yml
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/resources/data/sample-data.yml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/data/sample-data.yml
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/static/css/main.css b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/static/css/main.css
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/static/css/main.css
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/static/css/main.css
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/BetaA.html b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/BetaA.html
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/BetaA.html
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/BetaA.html
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/BetaB.html b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/BetaB.html
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/BetaB.html
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/BetaB.html
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/privacy.html b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/privacy.html
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/privacy.html
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/privacy.html
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/welcome.html b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/welcome.html
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/templates/welcome.html
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web/src/main/resources/templates/welcome.html
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/README.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/README.md
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/README.md
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/README.md
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/pom.xml
similarity index 92%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/pom.xml
index 63621f2b4534d..9fbd0647fe0cd 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>feature-management-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:feature-management-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-feature-management</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-feature-management;current} -->
   <name>Azure Spring Cloud Feature Management Sample</name>
 
   <dependencyManagement>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/ConsoleApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/ConsoleApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/ConsoleApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/ConsoleApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/FeatureFilterConfigurations.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/FeatureFilterConfigurations.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/FeatureFilterConfigurations.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/FeatureFilterConfigurations.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/Random.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/Random.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/Random.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/Random.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/TargetingContextAccessor.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/TargetingContextAccessor.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/java/com/example/TargetingContextAccessor.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/java/com/example/TargetingContextAccessor.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/resources/application.yml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/resources/application.yml
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-sample/src/main/resources/application.yml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/resources/application.yml
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/data/sample-data.yml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/resources/data/sample-data.yml
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample/src/main/resources/data/sample-data.yml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-feature-management/src/main/resources/data/sample-data.yml
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/README.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/README.md
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/README.md
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/README.md
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml
similarity index 85%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml
index ac11a637f0750..c04b123e2e08f 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>azure-messaging-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-messaging-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-messaging</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-messaging;current} -->
   <name>Azure Spring Cloud Messaging Sample</name>
 
   <dependencyManagement>
@@ -28,9 +28,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/src/main/java/com/example/MessagingApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/src/main/java/com/example/MessagingApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/src/main/java/com/example/MessagingApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/src/main/java/com/example/MessagingApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/src/main/java/com/example/User.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/src/main/java/com/example/User.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/src/main/java/com/example/User.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/src/main/java/com/example/User.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/src/main/java/com/example/WebController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/src/main/java/com/example/WebController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-messaging-sample/src/main/java/com/example/WebController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/src/main/java/com/example/WebController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml
index 756bd16a02e2d..634939b41180d 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>servicebus-operation-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:servicebus-operation-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-servicebus-operation</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-servicebus-operation;current} -->
   <name>Azure Spring Cloud Service Bus Operation Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/java/com/example/QueueController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/java/com/example/QueueController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/java/com/example/QueueController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/java/com/example/QueueController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/java/com/example/ServiceBusOperationApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/java/com/example/ServiceBusOperationApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/java/com/example/ServiceBusOperationApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/java/com/example/ServiceBusOperationApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/java/com/example/TopicController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/java/com/example/TopicController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/java/com/example/TopicController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/java/com/example/TopicController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/test/java/com/example/ServiceBusOperationApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/test/java/com/example/ServiceBusOperationApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/test/java/com/example/ServiceBusOperationApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/test/java/com/example/ServiceBusOperationApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml
index 2998ad8046556..ee26a03d472af 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>servicebus-queue-binder-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:servicebus-queue-binder-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-servicebus-queue-binder</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-servicebus-queue-binder;current} -->
   <name>Azure Spring Cloud Service Bus Queue Binder Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-queue-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-queue-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-queue-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-queue-stream-binder;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/java/com/example/ServiceBusQueueBinderApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/java/com/example/ServiceBusQueueBinderApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/java/com/example/ServiceBusQueueBinderApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/java/com/example/ServiceBusQueueBinderApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/java/com/example/SinkExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/java/com/example/SinkExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/java/com/example/SinkExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/java/com/example/SinkExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/java/com/example/SourceExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/java/com/example/SourceExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/java/com/example/SourceExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/java/com/example/SourceExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/test/java/com/example/ServiceBusQueueBinderApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/test/java/com/example/ServiceBusQueueBinderApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/test/java/com/example/ServiceBusQueueBinderApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/test/java/com/example/ServiceBusQueueBinderApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/test/resources/logback-test.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/test/resources/logback-test.xml
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/src/test/resources/logback-test.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/src/test/resources/logback-test.xml
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml
index bee50586f64ca..e6e2039b8cb14 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>servicebus-queue-multibinders-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:servicebus-queue-multibinders-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-servicebus-queue-multibinders</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-servicebus-queue-multibinders;current} -->
   <name>Azure Spring Cloud Service Bus Queue Multiple Binders Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-queue-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-queue-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-queue-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-queue-stream-binder;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/CustomProcessor.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/CustomProcessor.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/CustomProcessor.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/CustomProcessor.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/ServiceBusQueueMultiBindersApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/ServiceBusQueueMultiBindersApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/ServiceBusQueueMultiBindersApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/ServiceBusQueueMultiBindersApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/SinkExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/SinkExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/SinkExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/SinkExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/SourceExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/SourceExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/java/com/example/SourceExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/java/com/example/SourceExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/test/java/com/example/ServiceBusQueueMultiBindersApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/test/java/com/example/ServiceBusQueueMultiBindersApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/test/java/com/example/ServiceBusQueueMultiBindersApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/test/java/com/example/ServiceBusQueueMultiBindersApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml
index 4f56456f11892..b20cc68acefaa 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>servicebus-topic-binder-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:servicebus-topic-binder-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-servicebus-topic-binder</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-servicebus-topic-binder;current} -->
   <name>Azure Spring Cloud Service Bus Topic Binder Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-topic-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-topic-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-topic-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-topic-stream-binder;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/java/com/example/ServiceBusTopicBinderApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/java/com/example/ServiceBusTopicBinderApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/java/com/example/ServiceBusTopicBinderApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/java/com/example/ServiceBusTopicBinderApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/java/com/example/SinkExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/java/com/example/SinkExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/java/com/example/SinkExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/java/com/example/SinkExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/java/com/example/SourceExample.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/java/com/example/SourceExample.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/java/com/example/SourceExample.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/java/com/example/SourceExample.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/test/java/com/example/ServiceBusTopicBinderApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/test/java/com/example/ServiceBusTopicBinderApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/test/java/com/example/ServiceBusTopicBinderApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/test/java/com/example/ServiceBusTopicBinderApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml
index 6c69c90a07ca8..04f0dc27bcad3 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>storage-queue-operation-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:storage-queue-operation-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-storage-queue-operation</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-storage-queue-operation;current} -->
   <name>Azure Spring Cloud Storage Queue Operation Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-storage-queue</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-storage-queue;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-storage-queue;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/main/java/com/example/StorageQueueOperationApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/main/java/com/example/StorageQueueOperationApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/main/java/com/example/StorageQueueOperationApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/main/java/com/example/StorageQueueOperationApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/main/java/com/example/WebController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/main/java/com/example/WebController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/main/java/com/example/WebController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/main/java/com/example/WebController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/test/java/com/example/StorageQueueOperationApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/test/java/com/example/StorageQueueOperationApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/test/java/com/example/StorageQueueOperationApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/test/java/com/example/StorageQueueOperationApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/pom.xml
similarity index 85%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/pom.xml
index c1b1d5827cf74..f633ec3fadc09 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>storage-resource-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:storage-resource-sample;current} -->
+  <artifactId>azure-spring-cloud-sample-storage-resource</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-cloud-sample-storage-resource;current} -->
   <name>Azure Spring Cloud Storage Sample</name>
 
   <dependencyManagement>
@@ -28,9 +28,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-starter-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-starter-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-starter-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-starter-storage;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/main/java/com/example/BlobController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/main/java/com/example/BlobController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/main/java/com/example/BlobController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/main/java/com/example/BlobController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/main/java/com/example/StorageApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/main/java/com/example/StorageApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/main/java/com/example/StorageApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/main/java/com/example/StorageApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/test/java/com/example/StorageApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/test/java/com/example/StorageApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/test/java/com/example/StorageApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/test/java/com/example/StorageApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/CHANGELOG.md
deleted file mode 100644
index 43b25529c46ce..0000000000000
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release History
-
-## 1.2.8-beta.1 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml
index 2ace64300bd47..9b01f0d9ecbe7 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>eventhubs-integration-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:eventhubs-integration-sample;current} -->
+  <artifactId>azure-spring-integration-sample-eventhubs</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-integration-sample-eventhubs;current} -->
   <name>Azure Spring Cloud Event Hub Integration Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/java/com/example/EventHubIntegrationApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/java/com/example/EventHubIntegrationApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/java/com/example/EventHubIntegrationApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/java/com/example/EventHubIntegrationApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/java/com/example/ReceiveController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/java/com/example/ReceiveController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/java/com/example/ReceiveController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/java/com/example/ReceiveController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/java/com/example/SendController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/java/com/example/SendController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/java/com/example/SendController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/java/com/example/SendController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/test/java/com/example/EventHubOperationApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/test/java/com/example/EventHubOperationApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample/src/test/java/com/example/EventHubOperationApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/test/java/com/example/EventHubOperationApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml
similarity index 84%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml
index 018ecab9993a3..af62f78c93d2c 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>servicebus-integration-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:servicebus-integration-sample;current} -->
+  <artifactId>azure-spring-integration-sample-servicebus</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-integration-sample-servicebus;current} -->
   <name>Azure Spring Cloud Service Bus Integration Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/QueueReceiveController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/QueueReceiveController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/QueueReceiveController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/QueueReceiveController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/QueueSendController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/QueueSendController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/QueueSendController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/QueueSendController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/ServiceBusIntegrationApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/ServiceBusIntegrationApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/ServiceBusIntegrationApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/ServiceBusIntegrationApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/TopicReceiveController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/TopicReceiveController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/TopicReceiveController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/TopicReceiveController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/TopicSendController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/TopicSendController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/main/java/com/example/TopicSendController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/java/com/example/TopicSendController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/test/java/com/example/ServiceBusIntegrationApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/test/java/com/example/ServiceBusIntegrationApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample/src/test/java/com/example/ServiceBusIntegrationApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/test/java/com/example/ServiceBusIntegrationApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/CHANGELOG.md b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/CHANGELOG.md
new file mode 100644
index 0000000000000..3e7a007a97705
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Release History
+
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/README.adoc
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/README.adoc
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/README.adoc
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml
similarity index 85%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/pom.xml
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml
index db42ebd215e0d..56c774f128e0c 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml
@@ -9,9 +9,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>storage-queue-integration-sample</artifactId>
-  <groupId>com.microsoft.azure</groupId>
-  <version>1.2.8-beta.1</version> <!-- {x-version-update;com.microsoft.azure:storage-queue-integration-sample;current} -->
+  <artifactId>azure-spring-integration-sample-storage-queue</artifactId>
+  <groupId>com.azure</groupId>
+  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-spring-integration-sample-storage-queue;current} -->
   <name>Azure Spring Cloud Storage Queue Integration Sample</name>
 
   <dependencyManagement>
@@ -32,9 +32,9 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-storage-queue</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-storage-queue;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-storage-queue;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/java/com/example/ReceiveController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/java/com/example/ReceiveController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/java/com/example/ReceiveController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/java/com/example/ReceiveController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/java/com/example/SendController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/java/com/example/SendController.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/java/com/example/SendController.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/java/com/example/SendController.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/java/com/example/StorageQueueIntegrationApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/java/com/example/StorageQueueIntegrationApplication.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/main/java/com/example/StorageQueueIntegrationApplication.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/java/com/example/StorageQueueIntegrationApplication.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/resources/application.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample/src/main/resources/application.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/main/resources/application.properties
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/test/java/com/example/StorageQueueIntegrationApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/test/java/com/example/StorageQueueIntegrationApplicationIT.java
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/test/java/com/example/StorageQueueIntegrationApplicationIT.java
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/test/java/com/example/StorageQueueIntegrationApplicationIT.java
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/test/resources/application-test.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/test/resources/application-test.properties
similarity index 100%
rename from sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample/src/test/resources/application-test.properties
rename to sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/src/test/resources/application-test.properties
diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md b/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md
index a785f7d4d79aa..aec806bff072d 100644
--- a/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-autoconfigure/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/README.md b/sdk/spring/azure-spring-cloud-autoconfigure/README.md
index 5cc0e55acdfb8..a1e7813901356 100644
--- a/sdk/spring/azure-spring-cloud-autoconfigure/README.md
+++ b/sdk/spring/azure-spring-cloud-autoconfigure/README.md
@@ -20,9 +20,9 @@ dependency to your project and the Spring Cloud auto-configuration will kick-in:
 [//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current})
 ```xml
 <dependency>
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-  <version>1.2.8</version>
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+  <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -107,12 +107,12 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [service_bus]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-starter-servicebus
 [storage]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-starter-storage
 [storage_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-starter-storage-queue
-[app_configuration_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample
-[app_configuration_conversation_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete
-[cache_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample
-[event_hubs_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample
-[event_hubs_kafka_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample
-[service_bus_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample
-[storage_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample
-[storage_queue_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample
+[app_configuration_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration
+[app_configuration_conversation_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete
+[cache_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache
+[event_hubs_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs
+[event_hubs_kafka_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka
+[service_bus_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus
+[storage_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource
+[storage_queue_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml
index 5d681c1657b88..4cee4e54cb455 100644
--- a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml
+++ b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
 
   <name>Spring Cloud Azure Autoconfigure</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -37,9 +37,9 @@
 
 		<!-- Telemetry -->
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-telemetry</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-telemetry;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-telemetry</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-telemetry;current} -->
     </dependency>
 
 		<!-- Cloud SQL -->
@@ -83,17 +83,17 @@
 
 		<!-- Event Hub -->
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-eventhubs;current} -->
       <optional>true</optional>
     </dependency>
 
 		<!-- Service Bus -->
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-servicebus;current} -->
       <optional>true</optional>
     </dependency>
 
@@ -129,9 +129,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
       <optional>true</optional>
     </dependency>
 
@@ -191,9 +191,9 @@
 
     <!-- Dependencies on other modules for AutoConfiguration tests -->
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-storage;current} -->
       <scope>test</scope>
     </dependency>
 
@@ -210,10 +210,6 @@
             <bannedDependencies>
               <includes>
                 <include>com.fasterxml.jackson.core:jackson-core:[2.11.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
-                <include>com.microsoft.azure:spring-cloud-azure-context:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
-                <include>com.microsoft.azure:spring-cloud-azure-telemetry:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-telemetry;current} -->
-                <include>com.microsoft.azure:spring-integration-eventhubs:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-eventhubs;current} -->
-                <include>com.microsoft.azure:spring-integration-servicebus:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-servicebus;current} -->
                 <include>com.microsoft.sqlserver:mssql-jdbc:[7.4.1.jre8]</include> <!-- {x-include-update;com.microsoft.sqlserver:mssql-jdbc;external_dependency} -->
                 <include>mysql:mysql-connector-java:[8.0.21]</include> <!-- {x-include-update;mysql:mysql-connector-java;external_dependency} -->
                 <include>org.hibernate.validator:hibernate-validator:[6.1.5.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
diff --git a/sdk/spring/azure-spring-cloud-context/CHANGELOG.md b/sdk/spring/azure-spring-cloud-context/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-context/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-context/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-context/README.md b/sdk/spring/azure-spring-cloud-context/README.md
index 38009b587fa3e..f242ba1071b38 100644
--- a/sdk/spring/azure-spring-cloud-context/README.md
+++ b/sdk/spring/azure-spring-cloud-context/README.md
@@ -10,12 +10,12 @@ This package helps developers to finish the auto-configuration of Azure Context.
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-azure-context;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-context;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-azure-context</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-context</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/spring/azure-spring-cloud-context/pom.xml b/sdk/spring/azure-spring-cloud-context/pom.xml
index 5cfa01c71d537..7a9c012b25a00 100644
--- a/sdk/spring/azure-spring-cloud-context/pom.xml
+++ b/sdk/spring/azure-spring-cloud-context/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-context</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-context</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
 
   <name>Spring Cloud Azure Context</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -52,9 +52,9 @@
       <version>1.34.0</version> <!-- {x-version-update;spring_com.microsoft.azure:azure;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-telemetry</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-telemetry;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-telemetry</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-telemetry;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -106,7 +106,6 @@
             <bannedDependencies>
               <includes>
                 <include>com.microsoft.azure:azure:[1.34.0]</include> <!-- {x-include-update;spring_com.microsoft.azure:azure;external_dependency} -->
-                <include>com.microsoft.azure:spring-cloud-azure-telemetry:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-telemetry;current} -->
                 <include>commons-io:commons-io:[2.5]</include> <!-- {x-include-update;commons-io:commons-io;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-aop:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-aop;external_dependency} -->
diff --git a/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/CHANGELOG.md b/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/CHANGELOG.md
index 123585d4e5ab7..0a0797914acad 100644
--- a/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/README.md b/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/README.md
index 802d1796d0256..a3ff4fc832a3c 100644
--- a/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/README.md
+++ b/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/README.md
@@ -12,12 +12,12 @@ microservice using **Spring Cloud Stream** based on [Azure Event Hub][azure_even
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-eventhubs-stream-binder;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-azure-eventhubs-stream-binder</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-eventhubs-stream-binder</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -182,11 +182,11 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-azure-eventhubs-stream-binder
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-azure-eventhubs-stream-binder
 [docs]: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-cloud-stream-binder-java-app-azure-event-hub
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
-[eventhubs_multibinders_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample
+[eventhubs_multibinders_sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders
 [contributing_md]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/CONTRIBUTING.md
 [maven]: http://maven.apache.org/
 [azure_event_hub]: https://azure.microsoft.com/services/event-hubs/
diff --git a/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/pom.xml b/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/pom.xml
index 9ce5b17e97ef9..5abfd98002bf8 100644
--- a/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/pom.xml
+++ b/sdk/spring/azure-spring-cloud-eventhubs-stream-binder/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-eventhubs-stream-binder</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-eventhubs-stream-binder</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-eventhubs-stream-binder;current} -->
 
   <name>Azure Spring Cloud Stream Event Hubs binder</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -29,9 +29,9 @@
       <version>3.0.7.RELEASE</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-stream;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs;current} -->
     </dependency>
 
     <!-- Contains Azure Storage Blobs checkpoint store when using EventProcessorClient -->
@@ -49,9 +49,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-stream-binder-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-stream-binder-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-stream-binder-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-stream-binder-test;current} -->
       <scope>test</scope>
     </dependency>
     <!-- Added this dependency to include necessary annotations used by reactor core.
@@ -74,7 +74,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-starter-azure-eventhubs:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
                 <include>org.springframework.cloud:spring-cloud-stream:[3.0.7.RELEASE]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-stream;external_dependency} -->
               </includes>
diff --git a/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md b/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-messaging/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-messaging/pom.xml b/sdk/spring/azure-spring-cloud-messaging/pom.xml
index 832041a1e6c6c..afcaa6d726eb3 100644
--- a/sdk/spring/azure-spring-cloud-messaging/pom.xml
+++ b/sdk/spring/azure-spring-cloud-messaging/pom.xml
@@ -10,17 +10,17 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-messaging</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-messaging;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-messaging</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-messaging;current} -->
 
   <name>Azure Spring Cloud Messaging</name>
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -28,9 +28,9 @@
       <version>5.2.8.RELEASE</version> <!-- {x-version-update;org.springframework:spring-messaging;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -81,8 +81,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-context:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
-                <include>com.microsoft.azure:spring-integration-azure-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-azure-core;current} -->
                 <include>org.springframework:spring-messaging:[5.2.8.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-messaging;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/CHANGELOG.md b/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/CHANGELOG.md
index 7204248e0664e..5e667140e381f 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/README.md b/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/README.md
index 31634b300d884..b0ffe3cdf6c8f 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/README.md
+++ b/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/README.md
@@ -13,12 +13,12 @@ microservice using **Spring Cloud Stream** based on [Azure Service Bus Queue][az
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-azure-servicebus-queue-stream-binder;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-servicebus-queue-stream-binder;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-azure-servicebus-queue-stream-binder</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-servicebus-queue-stream-binder</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -151,13 +151,13 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [maven]: http://maven.apache.org
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-azure-servicebus-queue-stream-binder
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-azure-servicebus-queue-stream-binder
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder
 [spring_boot_logging]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
 [service_bus_queue_binder]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder
 [service_bus_topic_binder]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder
-[spring_cloud_stream_binder_service_bus_multiple_binders]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample
-[spring_cloud_stream_binder_service_bus_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample
-[spring_cloud_stream_binder_service_bus_topic]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample
+[spring_cloud_stream_binder_service_bus_multiple_binders]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders
+[spring_cloud_stream_binder_service_bus_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder
+[spring_cloud_stream_binder_service_bus_topic]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder
 [spring_integration]: https://spring.io/projects/spring-integration
 [src_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
diff --git a/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/pom.xml b/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/pom.xml
index 4a2d430681fba..96102517c21dc 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/pom.xml
+++ b/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-servicebus-queue-stream-binder</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-queue-stream-binder;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-servicebus-queue-stream-binder</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-queue-stream-binder;current} -->
 
   <name>Azure Spring Cloud Stream Service Bus Queue Binder</name>
   <description>Azure Service Bus Queue binder for Spring Cloud Stream</description>
@@ -25,9 +25,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-stream-binder-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-stream-binder-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-stream-binder-core;current} -->
     </dependency>
 
     <dependency>
@@ -38,9 +38,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-stream-binder-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-stream-binder-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-stream-binder-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-stream-binder-test;current} -->
       <scope>test</scope>
     </dependency>
     <!-- Added this dependency to include necessary annotations used by reactor core.
@@ -64,7 +64,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/CHANGELOG.md b/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/CHANGELOG.md
index 7204248e0664e..5e667140e381f 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/README.md b/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/README.md
index 4fc8ae8e2fd3b..78632733681d0 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/README.md
+++ b/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/README.md
@@ -13,12 +13,12 @@ microservice using **Spring Cloud Stream** based on [Azure Service Bus][azure_se
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-servicebus-stream-binder-core;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-azure-servicebus-stream-binder-core</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-servicebus-stream-binder-core</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -75,9 +75,9 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [spring_boot_logging]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
 [service_bus_queue_binder]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder
 [service_bus_topic_binder]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder
-[spring_cloud_stream_binder_service_bus_multiple_binders]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample
-[spring_cloud_stream_binder_service_bus_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample
-[spring_cloud_stream_binder_service_bus_topic]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample
+[spring_cloud_stream_binder_service_bus_multiple_binders]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders
+[spring_cloud_stream_binder_service_bus_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder
+[spring_cloud_stream_binder_service_bus_topic]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder
 [spring_integration]: https://spring.io/projects/spring-integration
 [src_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
diff --git a/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/pom.xml b/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/pom.xml
index f8101f753f4ac..9304ea36f4b55 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/pom.xml
+++ b/sdk/spring/azure-spring-cloud-servicebus-stream-binder-core/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-servicebus-stream-binder-core</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-servicebus-stream-binder-core</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-stream-binder-core;current} -->
 
   <name>Azure Spring Cloud Stream Service Bus Binder Core</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -28,14 +28,14 @@
       <version>3.0.7.RELEASE</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-stream;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-starter-azure-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-starter-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -64,8 +64,6 @@
             <bannedDependencies>
               <includes>
                 <include>com.microsoft.azure:azure-servicebus:[3.4.0]</include> <!-- {x-include-update;com.microsoft.azure:azure-servicebus;external_dependency} -->
-                <include>com.microsoft.azure:spring-cloud-azure-autoconfigure:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
-                <include>com.microsoft.azure:spring-cloud-starter-azure-servicebus:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current} -->
                 <include>org.springframework.cloud:spring-cloud-stream:[3.0.7.RELEASE]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-stream;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/CHANGELOG.md b/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/CHANGELOG.md
index 7204248e0664e..5e667140e381f 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/README.md b/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/README.md
index 6655405883552..651cd045e9972 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/README.md
+++ b/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/README.md
@@ -13,12 +13,12 @@ microservice using **Spring Cloud Stream** based on [Azure Service Bus Topic][az
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-azure-servicebus-topic-stream-binder;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-servicebus-topic-stream-binder;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-azure-servicebus-topic-stream-binder</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-servicebus-topic-stream-binder</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -147,13 +147,13 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [maven]: http://maven.apache.org
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-azure-servicebus-topic-stream-binder
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-azure-servicebus-topic-stream-binder
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder
 [spring_boot_logging]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
 [service_bus_queue_binder]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-queue-stream-binder
 [service_bus_topic_binder]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder
-[spring_cloud_stream_binder_service_bus_multiple_binders]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample
-[spring_cloud_stream_binder_service_bus_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample
-[spring_cloud_stream_binder_service_bus_topic]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample
+[spring_cloud_stream_binder_service_bus_multiple_binders]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders
+[spring_cloud_stream_binder_service_bus_queue]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder
+[spring_cloud_stream_binder_service_bus_topic]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder
 [spring_integration]: https://spring.io/projects/spring-integration
 [src_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
diff --git a/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/pom.xml b/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/pom.xml
index fca2a8c5475df..7f611ef427d4c 100644
--- a/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/pom.xml
+++ b/sdk/spring/azure-spring-cloud-servicebus-topic-stream-binder/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-servicebus-topic-stream-binder</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-topic-stream-binder;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-servicebus-topic-stream-binder</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-topic-stream-binder;current} -->
 
   <name>Azure Spring Cloud Stream Service Bus Topic Binder</name>
   <description>Azure Service Bus binder for Spring Cloud Stream</description>
@@ -25,9 +25,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-servicebus-stream-binder-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-servicebus-stream-binder-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-servicebus-stream-binder-core;current} -->
     </dependency>
 
     <dependency>
@@ -38,9 +38,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-stream-binder-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-stream-binder-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-stream-binder-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-stream-binder-test;current} -->
       <scope>test</scope>
     </dependency>
     <!-- Added this dependency to include necessary annotations used by reactor core.
@@ -64,7 +64,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-servicebus-stream-binder-core;current} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-starter-cache/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-starter-cache/README.md b/sdk/spring/azure-spring-cloud-starter-cache/README.md
index 974f7b1ff68e9..8c08a715f5490 100644
--- a/sdk/spring/azure-spring-cloud-starter-cache/README.md
+++ b/sdk/spring/azure-spring-cloud-starter-cache/README.md
@@ -10,12 +10,12 @@ This starter provides auto-configuration of Azure Cache for Redis. Azure Cache f
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-starter-azure-cache;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-starter-cache;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-starter-azure-cache</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-starter-cache</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -58,7 +58,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 <!-- Link -->
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-starter-azure-cache
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-starter-azure-cache
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-cache-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml
index c3d785ab45fde..2ac09e52b9f9e 100644
--- a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml
+++ b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml
@@ -10,17 +10,17 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-starter-azure-cache</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-starter-azure-cache;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-starter-cache</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-cache;current} -->
 
   <name>Azure Spring Cloud Starter Cache</name>
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -43,7 +43,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-autoconfigure:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
                 <include>org.springframework.boot:spring-boot-starter-cache:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-cache;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-data-redis:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-data-redis;external_dependency} -->
               </includes>
diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/README.md b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/README.md
index 8c7ce162bce06..cfe21276f2ff4 100644
--- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/README.md
+++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/README.md
@@ -10,12 +10,12 @@ The Spring Cloud Stream Kafka binder for Azure Event Hubs helps developers to fi
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-starter-azure-eventhubs-kafka;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-starter-eventhubs-kafka;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-starter-azure-eventhubs-kafka</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -59,7 +59,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-starter-azure-eventhubs-kafka
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-starter-azure-eventhubs-kafka
 [docs]: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-cloud-stream-binder-java-app-kafka-azure-event-hub
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml
index dd9f31a816b45..b50feee42cc11 100644
--- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml
+++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml
@@ -10,17 +10,17 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-starter-azure-eventhubs-kafka</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs-kafka;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs-kafka;current} -->
 
   <name>Azure Spring Cloud Starter Event Hubs Kafka</name>
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
@@ -28,9 +28,9 @@
       <version>3.0.7.RELEASE</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-stream-kafka;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
     </dependency>
   </dependencies>
   <build>
@@ -43,8 +43,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-autoconfigure:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
-                <include>com.microsoft.azure:spring-cloud-azure-context:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
                 <include>org.springframework.cloud:spring-cloud-starter-stream-kafka:[3.0.7.RELEASE]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-stream-kafka;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md
index 123585d4e5ab7..0a0797914acad 100644
--- a/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-starter-eventhubs/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs/README.md b/sdk/spring/azure-spring-cloud-starter-eventhubs/README.md
index 14be66b805efd..1616268d5f820 100644
--- a/sdk/spring/azure-spring-cloud-starter-eventhubs/README.md
+++ b/sdk/spring/azure-spring-cloud-starter-eventhubs/README.md
@@ -13,12 +13,12 @@ For Spring Integration on Event Hubs, please refer to the [source code][source_c
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-starter-eventhubs;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -61,7 +61,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 <!-- Link -->
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-starter-azure-eventhubs
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-starter-azure-eventhubs
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml
index 6319419cf06d1..c38b93813585a 100644
--- a/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml
+++ b/sdk/spring/azure-spring-cloud-starter-eventhubs/pom.xml
@@ -10,47 +10,31 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-starter-azure-eventhubs</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-eventhubs;current} -->
 
   <name>Azure Spring Cloud Starter Event Hubs</name>
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-eventhubs</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-eventhubs;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-eventhubs</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-eventhubs;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-messaging</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-messaging;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-messaging</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-messaging;current} -->
     </dependency>
 
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
-        <configuration>
-          <rules>
-            <bannedDependencies>
-              <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-autoconfigure:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
-                <include>com.microsoft.azure:spring-integration-eventhubs:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-eventhubs;current} -->
-                <include>com.microsoft.azure:spring-cloud-azure-messaging:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-messaging;current} -->
-              </includes>
-            </bannedDependencies>
-          </rules>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-starter-servicebus/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-starter-servicebus/README.md b/sdk/spring/azure-spring-cloud-starter-servicebus/README.md
index 5494cfa382454..6e2d905909fc9 100644
--- a/sdk/spring/azure-spring-cloud-starter-servicebus/README.md
+++ b/sdk/spring/azure-spring-cloud-starter-servicebus/README.md
@@ -12,12 +12,12 @@ The Spring Cloud Service Bus starter helps developers to finish the auto-configu
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-starter-servicebus;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-starter-azure-servicebus</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-starter-servicebus</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -64,8 +64,8 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [maven]: http://maven.apache.org
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-starter-azure-servicebus
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-starter-azure-servicebus
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus
 [spring_boot_logging]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
 [spring_integration]: https://spring.io/projects/spring-integration
-[spring_cloud_starter_sample_with_service_bus]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample
+[spring_cloud_starter_sample_with_service_bus]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
diff --git a/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml b/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml
index b88221f5bbf2c..fd83586716f8d 100644
--- a/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml
+++ b/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml
@@ -10,21 +10,21 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-starter-azure-servicebus</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-servicebus;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-starter-servicebus</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-servicebus;current} -->
 
   <name>Azure Spring Cloud Starter Service Bus</name>
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-servicebus</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-servicebus;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-servicebus</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -42,8 +42,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-autoconfigure:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
-                <include>com.microsoft.azure:spring-integration-servicebus:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-servicebus;current} -->
                 <include>com.microsoft.azure:azure-servicebus:[3.4.0]</include> <!-- {x-include-update;com.microsoft.azure:azure-servicebus;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md b/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-starter-storage-queue/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-starter-storage-queue/README.md b/sdk/spring/azure-spring-cloud-starter-storage-queue/README.md
index c77915d2aba5f..115a09563da57 100644
--- a/sdk/spring/azure-spring-cloud-starter-storage-queue/README.md
+++ b/sdk/spring/azure-spring-cloud-starter-storage-queue/README.md
@@ -12,12 +12,12 @@ The Spring Cloud Storage Queue starter helps developers to finish the auto-confi
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-starter-azure-storage-queue;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-starter-storage-queue;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-starter-azure-storage-queue</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -61,7 +61,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 <!-- Link -->
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-starter-azure-storage-queue
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-starter-azure-storage-queue
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml b/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml
index bfb7ae4c83202..5fe82f848ca86 100644
--- a/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml
+++ b/sdk/spring/azure-spring-cloud-starter-storage-queue/pom.xml
@@ -13,47 +13,31 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-starter-azure-storage-queue</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-starter-azure-storage-queue;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-starter-storage-queue;current} -->
 
   <name>Azure Spring Cloud Starter Storage Queue</name>
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-storage;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-storage-queue</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-storage-queue;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-storage-queue</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-storage-queue;current} -->
     </dependency>
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
-        <configuration>
-          <rules>
-            <bannedDependencies>
-              <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-context:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
-                <include>com.microsoft.azure:spring-cloud-azure-storage:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
-                <include>com.microsoft.azure:spring-integration-storage-queue:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-storage-queue;current} -->
-              </includes>
-            </bannedDependencies>
-          </rules>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md b/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md
index 226c139d34545..25561cbaf2c89 100644
--- a/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-storage/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-storage/README.md b/sdk/spring/azure-spring-cloud-storage/README.md
index 7149957d36de9..641722fdc20a7 100644
--- a/sdk/spring/azure-spring-cloud-storage/README.md
+++ b/sdk/spring/azure-spring-cloud-storage/README.md
@@ -10,12 +10,12 @@ This package helps developers to finish the auto-configuration of Azure Storage.
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-azure-storage;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-cloud-storage;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-cloud-azure-storage</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-cloud-storage</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -57,7 +57,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [src]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-cloud-storage
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-cloud-azure-storage
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-cloud-azure-storage
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-cloud-storage/pom.xml b/sdk/spring/azure-spring-cloud-storage/pom.xml
index af295644d1052..749969522874d 100644
--- a/sdk/spring/azure-spring-cloud-storage/pom.xml
+++ b/sdk/spring/azure-spring-cloud-storage/pom.xml
@@ -10,17 +10,17 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-storage</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-storage</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-storage;current} -->
 
   <name>Azure Spring Cloud Storage</name>
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
     </dependency>
 
     <dependency>
@@ -52,9 +52,9 @@
 
     <!-- Storage Queue -->
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-storage-queue</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-storage-queue;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-storage-queue</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-storage-queue;current} -->
       <optional>true</optional>
     </dependency>
 
@@ -134,8 +134,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-context:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
-                <include>com.microsoft.azure:spring-integration-storage-queue:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-storage-queue;current} -->
                 <include>org.hibernate.validator:hibernate-validator:[6.1.5.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
diff --git a/sdk/spring/azure-spring-cloud-stream-binder-test/CHANGELOG.md b/sdk/spring/azure-spring-cloud-stream-binder-test/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-stream-binder-test/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-stream-binder-test/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml
index 74f20ead49e8f..9e762c83934b1 100644
--- a/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml
+++ b/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-stream-binder-test</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-stream-binder-test;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-stream-binder-test</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-stream-binder-test;current} -->
 
   <name>Azure Spring Cloud Stream Binder Test</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -59,9 +59,9 @@
       <version>3.0.7.RELEASE</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-stream;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-autoconfigure</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-autoconfigure;current} -->
     </dependency>
   </dependencies>
 
@@ -75,8 +75,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-autoconfigure:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-autoconfigure;current} -->
-                <include>com.microsoft.azure:spring-integration-azure-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-azure-core;current} -->
                 <include>junit:junit:[4.13]</include> <!-- {x-include-update;junit:junit;external_dependency} -->
                 <include>org.hibernate.validator:hibernate-validator:[6.1.5.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
                 <include>org.mockito:mockito-core:[3.3.3]</include> <!-- {x-include-update;org.mockito:mockito-core;external_dependency} -->
diff --git a/sdk/spring/azure-spring-cloud-telemetry/CHANGELOG.md b/sdk/spring/azure-spring-cloud-telemetry/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-cloud-telemetry/CHANGELOG.md
+++ b/sdk/spring/azure-spring-cloud-telemetry/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-cloud-telemetry/pom.xml b/sdk/spring/azure-spring-cloud-telemetry/pom.xml
index 4fdf2f05e173b..e6cb226443697 100644
--- a/sdk/spring/azure-spring-cloud-telemetry/pom.xml
+++ b/sdk/spring/azure-spring-cloud-telemetry/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-cloud-azure-telemetry</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-telemetry;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-cloud-telemetry</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-telemetry;current} -->
 
   <name>Spring Cloud Azure Telemetry</name>
 
diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
index 99c8e90e520b2..7b38c5823b8fb 100644
--- a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
+++ b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
@@ -25,9 +25,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-eventhubs-stream-binder</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-eventhubs-stream-binder</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-eventhubs-stream-binder;current} -->
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -59,7 +59,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-eventhubs-stream-binder;current} -->
                 <include>com.google.code.gson:gson:[2.8.6]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/azure-spring-cloud-test-storage/pom.xml b/sdk/spring/azure-spring-cloud-test-storage/pom.xml
index 56fe2f9708a3c..6d479a82078a6 100644
--- a/sdk/spring/azure-spring-cloud-test-storage/pom.xml
+++ b/sdk/spring/azure-spring-cloud-test-storage/pom.xml
@@ -20,9 +20,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-storage;current} -->
       <exclusions>
         <exclusion>
           <artifactId>gson</artifactId>
@@ -69,7 +69,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-storage:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
                 <include>org.springframework.boot:spring-boot-starter-web:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-starter-actuator:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
               </includes>
diff --git a/sdk/spring/azure-spring-integration-core/CHANGELOG.md b/sdk/spring/azure-spring-integration-core/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-integration-core/CHANGELOG.md
+++ b/sdk/spring/azure-spring-integration-core/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-integration-core/pom.xml b/sdk/spring/azure-spring-integration-core/pom.xml
index 1fd31dd97bb61..a789c24ef4400 100644
--- a/sdk/spring/azure-spring-integration-core/pom.xml
+++ b/sdk/spring/azure-spring-integration-core/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-integration-azure-core</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-integration-core</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
 
   <name>Azure Spring Integration Core</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -24,9 +24,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-context</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-context</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-context;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -59,7 +59,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-context:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-context;current} -->
                 <include>org.springframework.integration:spring-integration-core:[5.3.2.RELEASE]</include> <!-- {x-include-update;org.springframework.integration:spring-integration-core;external_dependency} -->
                 <include>org.springframework:spring-messaging:[5.2.8.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-messaging;external_dependency} -->
               </includes>
diff --git a/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md b/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md
+++ b/sdk/spring/azure-spring-integration-eventhubs/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-integration-eventhubs/README.md b/sdk/spring/azure-spring-integration-eventhubs/README.md
index 4ad5af14882e2..2123c96ec786d 100644
--- a/sdk/spring/azure-spring-integration-eventhubs/README.md
+++ b/sdk/spring/azure-spring-integration-eventhubs/README.md
@@ -12,12 +12,12 @@ Event Hubs is a fully managed, real-time data ingestion service that’s simple,
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-integration-eventhubs;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-integration-eventhubs;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-integration-eventhubs</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-integration-eventhubs</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -61,7 +61,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [src]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-integration-eventhubs/src
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-integration-eventhubs
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-integration-eventhubs
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-integration-eventhubs/pom.xml b/sdk/spring/azure-spring-integration-eventhubs/pom.xml
index 5a46e93b5f1fc..b35ba829a7de4 100644
--- a/sdk/spring/azure-spring-integration-eventhubs/pom.xml
+++ b/sdk/spring/azure-spring-integration-eventhubs/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-integration-eventhubs</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-eventhubs;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-integration-eventhubs</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-eventhubs;current} -->
 
   <name>Azure Spring Integration Event Hubs</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -24,9 +24,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -41,9 +41,9 @@
       <version>1.2.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-test;current} -->
       <scope>test</scope>
     </dependency>
     <!-- Added this dependency to include necessary annotations used by reactor core.
@@ -56,22 +56,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
-        <configuration>
-          <rules>
-            <bannedDependencies>
-              <includes>
-                <include>com.microsoft.azure:spring-integration-azure-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-azure-core;current} -->
-              </includes>
-            </bannedDependencies>
-          </rules>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/sdk/spring/azure-spring-integration-servicebus/CHANGELOG.md b/sdk/spring/azure-spring-integration-servicebus/CHANGELOG.md
index 7204248e0664e..5e667140e381f 100644
--- a/sdk/spring/azure-spring-integration-servicebus/CHANGELOG.md
+++ b/sdk/spring/azure-spring-integration-servicebus/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-integration-servicebus/README.md b/sdk/spring/azure-spring-integration-servicebus/README.md
index a19667e43c988..3803e67dfd8b0 100644
--- a/sdk/spring/azure-spring-integration-servicebus/README.md
+++ b/sdk/spring/azure-spring-integration-servicebus/README.md
@@ -14,12 +14,12 @@ Service Bus offers a reliable and secure platform for asynchronous transfer of d
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-integration-servicebus;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-integration-servicebus;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-integration-servicebus</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-integration-servicebus</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -66,9 +66,9 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [maven]: http://maven.apache.org
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-integration-servicebus
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-integration-servicebus
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus
 [spring_boot_logging]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
 [spring_integration]: https://spring.io/projects/spring-integration
-[spring_integration_sample_with_service_bus]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample
+[spring_integration_sample_with_service_bus]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus
 [src_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-integration-servicebus
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
diff --git a/sdk/spring/azure-spring-integration-servicebus/pom.xml b/sdk/spring/azure-spring-integration-servicebus/pom.xml
index 5922cd2db2b09..3cd561fd66280 100644
--- a/sdk/spring/azure-spring-integration-servicebus/pom.xml
+++ b/sdk/spring/azure-spring-integration-servicebus/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-integration-servicebus</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-servicebus;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-integration-servicebus</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-servicebus;current} -->
 
   <name>Azure Spring Integration Service Bus</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -24,9 +24,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -34,9 +34,9 @@
       <version>3.4.0</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus;external_dependency} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-test;current} -->
       <scope>test</scope>
     </dependency>
     <!-- Added this dependency to include necessary annotations used by reactor core.
@@ -60,7 +60,6 @@
             <bannedDependencies>
               <includes>
                 <include>com.microsoft.azure:azure-servicebus:[3.4.0]</include> <!-- {x-include-update;com.microsoft.azure:azure-servicebus;external_dependency} -->
-                <include>com.microsoft.azure:spring-integration-azure-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-azure-core;current} -->
               </includes>
             </bannedDependencies>
           </rules>
diff --git a/sdk/spring/azure-spring-integration-storage-queue/CHANGELOG.md b/sdk/spring/azure-spring-integration-storage-queue/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-integration-storage-queue/CHANGELOG.md
+++ b/sdk/spring/azure-spring-integration-storage-queue/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-integration-storage-queue/README.md b/sdk/spring/azure-spring-integration-storage-queue/README.md
index df023155c3901..dd2eb7224de4d 100644
--- a/sdk/spring/azure-spring-integration-storage-queue/README.md
+++ b/sdk/spring/azure-spring-integration-storage-queue/README.md
@@ -10,12 +10,12 @@ The *Spring Integration for Storage Queue* extension project provides inbound an
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-integration-storage-queue;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-integration-storage-queue;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-integration-storage-queue</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-integration-storage-queue</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -58,7 +58,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [src]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-integration-storage-queue
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-integration-storage-queue
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-integration-storage-queue
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-integration-storage-queue/pom.xml b/sdk/spring/azure-spring-integration-storage-queue/pom.xml
index 6828d3cbf61e5..5e505771c80db 100644
--- a/sdk/spring/azure-spring-integration-storage-queue/pom.xml
+++ b/sdk/spring/azure-spring-integration-storage-queue/pom.xml
@@ -11,9 +11,9 @@
   <modelVersion>4.0.0</modelVersion>
 
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-integration-storage-queue</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-storage-queue;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-integration-storage-queue</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-storage-queue;current} -->
 
   <name>Azure Spring Integration Storage Queue</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -25,14 +25,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
     </dependency>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-test</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-test;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-test</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-test;current} -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -51,22 +51,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
-        <configuration>
-          <rules>
-            <bannedDependencies>
-              <includes>
-                <include>com.microsoft.azure:spring-integration-azure-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-azure-core;current} -->
-              </includes>
-            </bannedDependencies>
-          </rules>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/sdk/spring/azure-spring-integration-test/CHANGELOG.md b/sdk/spring/azure-spring-integration-test/CHANGELOG.md
index 3da7d78ed0693..699c443790e01 100644
--- a/sdk/spring/azure-spring-integration-test/CHANGELOG.md
+++ b/sdk/spring/azure-spring-integration-test/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-integration-test/pom.xml b/sdk/spring/azure-spring-integration-test/pom.xml
index 15fe337fa520e..cecfefac6de77 100644
--- a/sdk/spring/azure-spring-integration-test/pom.xml
+++ b/sdk/spring/azure-spring-integration-test/pom.xml
@@ -10,9 +10,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-integration-azure-test</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-test;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-integration-test</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-test;current} -->
 
   <name>Azure Spring Integration Test</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -24,9 +24,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-integration-azure-core</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-integration-azure-core;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-integration-core</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-integration-core;current} -->
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -76,7 +76,6 @@
             <bannedDependencies>
               <includes>
                 <include>com.fasterxml.jackson.core:jackson-databind:[2.11.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
-                <include>com.microsoft.azure:spring-integration-azure-core:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-integration-azure-core;current} -->
                 <include>junit:junit:[4.13]</include> <!-- {x-include-update;junit:junit;external_dependency} -->
                 <include>org.hibernate.validator:hibernate-validator:[6.1.5.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
                 <include>org.mockito:mockito-core:[3.3.3]</include> <!-- {x-include-update;org.mockito:mockito-core;external_dependency} -->
diff --git a/sdk/spring/azure-spring-starter-storage/CHANGELOG.md b/sdk/spring/azure-spring-starter-storage/CHANGELOG.md
index 226c139d34545..25561cbaf2c89 100644
--- a/sdk/spring/azure-spring-starter-storage/CHANGELOG.md
+++ b/sdk/spring/azure-spring-starter-storage/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.3.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.2.8 (2020-09-14)
diff --git a/sdk/spring/azure-spring-starter-storage/README.md b/sdk/spring/azure-spring-starter-storage/README.md
index 590302de8fd62..f63490da242b4 100644
--- a/sdk/spring/azure-spring-starter-storage/README.md
+++ b/sdk/spring/azure-spring-starter-storage/README.md
@@ -9,12 +9,12 @@ The project provides a Spring Boot Starter `spring-starter-azure-storage` to aut
 - [Maven][maven] 3.0 and above
 
 ### Include the package
-[//]: # ({x-version-update-start;com.microsoft.azure:spring-starter-azure-storage;current})
+[//]: # ({x-version-update-start;com.azure:azure-spring-starter-storage;current})
 ```xml
 <dependency>
-    <groupId>com.microsoft.azure</groupId>
-    <artifactId>spring-starter-azure-storage</artifactId>
-    <version>1.2.8</version>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-spring-starter-storage</artifactId>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -93,7 +93,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
 [src]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-starter-storage
 [package]: https://mvnrepository.com/artifact/com.microsoft.azure/spring-starter-azure-storage
 [refdocs]: https://azure.github.io/azure-sdk-for-java/spring.html#spring-starter-azure-storage
-[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample
+[sample]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource
 [logging]: https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK#use-logback-logging-framework-in-a-spring-boot-application
 [azure_subscription]: https://azure.microsoft.com/free
 [logging_doc]: https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-logging
diff --git a/sdk/spring/azure-spring-starter-storage/pom.xml b/sdk/spring/azure-spring-starter-storage/pom.xml
index 9d4125be4e4a4..5e1ea14e9a228 100644
--- a/sdk/spring/azure-spring-starter-storage/pom.xml
+++ b/sdk/spring/azure-spring-starter-storage/pom.xml
@@ -10,16 +10,16 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.microsoft.azure</groupId>
-  <artifactId>spring-starter-azure-storage</artifactId>
-  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-starter-azure-storage;current} -->
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-starter-storage</artifactId>
+  <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-starter-storage;current} -->
 
   <name>Azure Spring Cloud Starter Storage</name>
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>spring-cloud-azure-storage</artifactId>
-      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-cloud-storage</artifactId>
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-cloud-storage;current} -->
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -37,7 +37,6 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.microsoft.azure:spring-cloud-azure-storage:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-storage;current} -->
                 <include>org.springframework.boot:spring-boot-starter:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
               </includes>
             </bannedDependencies>
diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml
index a7b42978e1f0d..3b839b4521376 100644
--- a/sdk/spring/ci.yml
+++ b/sdk/spring/ci.yml
@@ -57,69 +57,69 @@ extends:
       - name: azure-spring-boot-starter-servicebus-jms
         groupId: com.azure
         safeName: azurespringbootstarterservicebusjms
-      - name: spring-cloud-azure-context
-        groupId: com.microsoft.azure
+      - name: azure-spring-cloud-context
+        groupId: com.azure
         safeName: azurespringcloudcontext
-      - name: spring-cloud-azure-telemetry
-        groupId: com.microsoft.azure
+      - name: azure-spring-cloud-telemetry
+        groupId: com.azure
         safeName: azurespringcloudtelemetry
-      - name: spring-integration-azure-core
-        groupId: com.microsoft.azure
-        safeName: springintegrationazurecore
-      - name: spring-integration-azure-test
-        groupId: com.microsoft.azure
-        safeName: springintegrationazuretest
-      - name: spring-integration-eventhubs
-        groupId: com.microsoft.azure
-        safeName: springintegrationeventhubs
-      - name: spring-integration-servicebus
-        groupId: com.microsoft.azure
-        safeName: springintegrationservicebus
-      - name: spring-integration-storage-queue
-        groupId: com.microsoft.azure
-        safeName: springintegrationstoragequeue
-      - name: spring-cloud-azure-storage
-        groupId: com.microsoft.azure
-        safeName: springcloudazurestorage
-      - name: spring-cloud-azure-autoconfigure
-        groupId: com.microsoft.azure
-        safeName: springcloudazureautoconfigure
-      - name: spring-cloud-azure-messaging
-        groupId: com.microsoft.azure
-        safeName: springcloudazuremessaging
-      - name: spring-starter-azure-cache
-        groupId: com.microsoft.azure
-        safeName: springstarterazurecache
-      - name: spring-cloud-starter-azure-eventhubs
-        groupId: com.microsoft.azure
-        safeName: springcloudstarterazureeventhubs
-      - name: spring-cloud-starter-azure-eventhubs-kafka
-        groupId: com.microsoft.azure
-        safeName: springcloudstarterazureeventhubskafka
-      - name: spring-cloud-starter-azure-servicebus
-        groupId: com.microsoft.azure
-        safeName: springcloudstarterazureservicebus
-      - name: spring-starter-azure-storage
-        groupId: com.microsoft.azure
-        safeName: springstarterazurestorage
-      - name: spring-cloud-starter-azure-storage-queue
-        groupId: com.microsoft.azure
-        safeName: springcloudstarterazurestoragequeue
-      - name: spring-cloud-azure-servicebus-stream-binder-core
-        groupId: com.microsoft.azure
-        safeName: springcloudazureservicebusstreambindercore
-      - name: spring-cloud-azure-stream-binder-test
-        groupId: com.microsoft.azure
-        safeName: springcloudazurestreambindertest
-      - name: spring-cloud-azure-servicebus-topic-stream-binder
-        groupId: com.microsoft.azure
-        safeName: springcloudazureservicebustopicstreambinder
-      - name: spring-cloud-azure-servicebus-queue-stream-binder
-        groupId: com.microsoft.azure
-        safeName: springcloudazureservicebusqueuestreambinder
-      - name: spring-cloud-azure-eventhubs-stream-binder
-        groupId: com.microsoft.azure
-        safeName: springcloudazureeventhubsstreambinder
+      - name: azure-spring-integration-core
+        groupId: com.azure
+        safeName: azurespringintegrationcore
+      - name: azure-spring-integration-test
+        groupId: com.azure
+        safeName: azurespringintegrationtest
+      - name: azure-spring-integration-eventhubs
+        groupId: com.azure
+        safeName: azurespringintegrationeventhubs
+      - name: azure-spring-integration-servicebus
+        groupId: com.azure
+        safeName: azurespringintegrationservicebus
+      - name: azure-spring-integration-storage-queue
+        groupId: com.azure
+        safeName: azurespringintegrationstoragequeue
+      - name: azure-spring-cloud-storage
+        groupId: com.azure
+        safeName: azurespringcloudstorage
+      - name: azure-spring-cloud-autoconfigure
+        groupId: com.azure
+        safeName: azurespringcloudautoconfigure
+      - name: azure-spring-cloud-messaging
+        groupId: com.azure
+        safeName: azurespringcloudmessaging
+      - name: azure-spring-cloud-starter-cache
+        groupId: com.azure
+        safeName: azurespringcloudstartercache
+      - name: azure-spring-cloud-starter-eventhubs
+        groupId: com.azure
+        safeName: azurespringcloudstartereventhubs
+      - name: azure-spring-cloud-starter-eventhubs-kafka
+        groupId: com.azure
+        safeName: azurespringcloudstartereventhubskafka
+      - name: azure-spring-cloud-starter-servicebus
+        groupId: com.azure
+        safeName: azurespringcloudstarterservicebus
+      - name: azure-spring-starter-storage
+        groupId: com.azure
+        safeName: azurespringstarterstorage
+      - name: azure-spring-cloud-starter-storage-queue
+        groupId: com.azure
+        safeName: azurespringcloudstarterstoragequeue
+      - name: azure-spring-cloud-servicebus-stream-binder-core
+        groupId: com.azure
+        safeName: azurespringcloudservicebusstreambindercore
+      - name: azure-spring-cloud-stream-binder-test
+        groupId: com.azure
+        safeName: azurespringcloudstreambindertest
+      - name: azure-spring-cloud-servicebus-topic-stream-binder
+        groupId: com.azure
+        safeName: azurespringcloudservicebustopicstreambinder
+      - name: azure-spring-cloud-servicebus-queue-stream-binder
+        groupId: com.azure
+        safeName: azurespringcloudservicebusqueuestreambinder
+      - name: azure-spring-cloud-eventhubs-stream-binder
+        groupId: com.azure
+        safeName: azurespringcloudeventhubsstreambinder
     AdditionalModules:
       - name: azure-spring-boot-sample-active-directory
         groupId: com.azure
@@ -151,45 +151,45 @@ extends:
         groupId: com.azure
       - name: azure-spring-data-sample-gremlin-web-service
         groupId: com.azure
-      - name: spring-cloud-azure-appconfiguration-convert-sample-complete
-        groupId: com.microsoft.azure
-      - name: azure-appconfiguration-convert-sample-initial
-        groupId: com.microsoft.azure
-      - name: azure-appconfiguration-sample
-        groupId: com.microsoft.azure
-      - name: cache-sample
-        groupId: com.microsoft.azure
-      - name: eventhubs-binder-sample
-        groupId: com.microsoft.azure
-      - name: eventhubs-integration-sample
-        groupId: com.microsoft.azure
-      - name: eventhubs-kafka-sample
-        groupId: com.microsoft.azure
-      - name: eventhubs-multibinders-sample
-        groupId: com.microsoft.azure
-      - name: eventhubs-operation-sample
-        groupId: com.microsoft.azure
-      - name: feature-management-sample
-        groupId: com.microsoft.azure
-      - name: feature-management-web-sample
-        groupId: com.microsoft.azure
-      - name: azure-messaging-sample
-        groupId: com.microsoft.azure
-      - name: eventhubs-multibinders-sample
-        groupId: com.microsoft.azure
-      - name: servicebus-integration-sample
-        groupId: com.microsoft.azure
-      - name: servicebus-operation-sample
-        groupId: com.microsoft.azure
-      - name: servicebus-queue-binder-sample
-        groupId: com.microsoft.azure
-      - name: servicebus-queue-multibinders-sample
-        groupId: com.microsoft.azure
-      - name: servicebus-topic-binder-sample
-        groupId: com.microsoft.azure
-      - name: storage-queue-integration-sample
-        groupId: com.microsoft.azure
-      - name: storage-queue-operation-sample
-        groupId: com.microsoft.azure
-      - name: storage-resource-sample
-        groupId: com.microsoft.azure
+      - name: azure-spring-cloud-sample-appconfiguration-convert-complete
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-appconfiguration-convert-initial
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-appconfiguration
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-cache
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-eventhubs-binder
+        groupId: com.azure
+      - name: azure-spring-integration-sample-eventhubs
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-eventhubs-kafka
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-eventhubs-multibinders
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-eventhubs-operation
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-feature-management
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-feature-management-web
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-messaging
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-eventhubs-multibinders
+        groupId: com.azure
+      - name: azure-spring-integration-sample-servicebus
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-servicebus-operation
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-servicebus-queue-binder
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-servicebus-queue-multibinders
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-servicebus-topic-binder
+        groupId: com.azure
+      - name: azure-spring-integration-sample-storage-queue
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-storage-queue-operation
+        groupId: com.azure
+      - name: azure-spring-cloud-sample-storage-resource
+        groupId: com.azure
diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml
index ad37be69d9963..675419e350d2a 100644
--- a/sdk/spring/pom.xml
+++ b/sdk/spring/pom.xml
@@ -41,26 +41,26 @@
     <module>azure-spring-boot-samples/azure-spring-data-sample-gremlin</module>
     <module>azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service</module>
     <module>azure-spring-boot-samples/azure-cloud-foundry-service-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-cache-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-initial</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-appconfiguration-conversion-sample-complete</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-appconfiguration-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-storage-resource-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-eventhubs-operation-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-eventhubs-integration-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-eventhubs-binder-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-eventhubs-multibinders-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-eventhubs-kafka-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-feature-management-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-feature-management-web-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-servicebus-operation-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-servicebus-integration-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-binder-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-servicebus-topic-binder-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-storage-queue-operation-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-storage-queue-integration-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-messaging-sample</module>
-    <module>azure-spring-boot-samples/azure-spring-cloud-servicebus-queue-multibinders-sample</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-complete</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-appconfiguration-conversion-initial</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-cache</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-feature-management</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-feature-management-web</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-messaging</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation</module>
+    <module>azure-spring-boot-samples/azure-spring-cloud-sample-storage-resource</module>
+    <module>azure-spring-boot-samples/azure-spring-integration-sample-eventhubs</module>
+    <module>azure-spring-boot-samples/azure-spring-integration-sample-servicebus</module>
+    <module>azure-spring-boot-samples/azure-spring-integration-sample-storage-queue</module>
     <module>azure-spring-cloud-autoconfigure</module>
     <module>azure-spring-cloud-context</module>
     <module>azure-spring-cloud-storage</module>