diff --git a/initializr-service/src/main/resources/application.yml b/initializr-service/src/main/resources/application.yml
index 70c31454..81ef681d 100644
--- a/initializr-service/src/main/resources/application.yml
+++ b/initializr-service/src/main/resources/application.yml
@@ -724,17 +724,25 @@ initializr:
           id: cloud-eureka
           description: Service discovery using spring-cloud-netflix and Eureka
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-eureka
+          artifactId: spring-cloud-starter-netflix-eureka-client
           weight: 100
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-eureka
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Eureka Server
           id: cloud-eureka-server
           description: spring-cloud-netflix Eureka Server
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-eureka-server
+          artifactId: spring-cloud-starter-netflix-eureka-server
           links:
             - rel: guide
               href: https://spring.io/guides/gs/service-registration-and-discovery/
               description: Service Registration and Discovery
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-eureka-server
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Zookeeper Discovery
           id: cloud-starter-zookeeper-discovery
           description: Service discovery with Zookeeper and spring-cloud-zookeeper-discovery
@@ -761,25 +769,37 @@ initializr:
           id: cloud-zuul
           description: Intelligent and programmable routing with spring-cloud-netflix Zuul
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-zuul
+          artifactId: spring-cloud-starter-netflix-zuul
           links:
             - rel: guide
               href: https://spring.io/guides/gs/routing-and-filtering/
               description: Routing and Filtering
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-zuul
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Ribbon
           id: cloud-ribbon
           description: Client side load balancing with spring-cloud-netflix and Ribbon
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-ribbon
+          artifactId: spring-cloud-starter-netflix-ribbon
           links:
             - rel: guide
               href: https://spring.io/guides/gs/client-side-load-balancing/
               description: Client Side Load Balancing with Ribbon and Spring Cloud
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-ribbon
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Feign
           id: cloud-feign
           description: Declarative REST clients with spring-cloud-netflix Feign
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-feign
+          artifactId: spring-cloud-starter-openfeign
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-feign
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
     - name: Cloud Circuit Breaker
       bom: spring-cloud
       versionRange: 1.2.3.RELEASE
@@ -788,28 +808,44 @@ initializr:
           id: cloud-hystrix
           description: Circuit breaker with spring-cloud-netflix Hystrix
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-hystrix
+          artifactId: spring-cloud-starter-netflix-hystrix
           links:
             - rel: guide
               href: https://spring.io/guides/gs/circuit-breaker/
               description: Circuit Breaker
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-hystrix
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Hystrix Dashboard
           id: cloud-hystrix-dashboard
           description: Circuit breaker dashboard with spring-cloud-netflix Hystrix
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-hystrix-dashboard
+          artifactId: spring-cloud-starter-netflix-hystrix-dashboard
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-hystrix-dashboard
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Turbine
           id: cloud-turbine
           description: Circuit breaker metric aggregation using spring-cloud-netflix with Turbine and server-sent events
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-turbine
+          artifactId: spring-cloud-starter-netflix-turbine
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-turbine
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
         - name: Turbine Stream
           id: cloud-turbine-stream
           description: Circuit breaker metric aggregation using spring-cloud-netflix with Turbine and Spring Cloud Stream (choose a specific Stream binder implementation to complement this)
           versionRange: 1.3.0.RELEASE
           groupId: org.springframework.cloud
-          artifactId: spring-cloud-starter-turbine-stream
+          artifactId: spring-cloud-starter-netflix-turbine-stream
           weight: -1
+          mappings:
+            - versionRange: "[1.2.3.RELEASE,1.5.x.RELEASE]"
+              artifactId: spring-cloud-starter-turbine-stream
+            - versionRange: "1.5.0.BUILD-SNAPSHOT"
     - name: Cloud Tracing
       bom: spring-cloud
       versionRange: 1.3.0.RELEASE