diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
index d699f68e..ccb5fc66 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -557,9 +557,9 @@ public class ProjectGenerator {
 			return "kotlin-stdlib";
 		}
 		else if ("1.7".equals(javaVersion)) {
-			return "kotlin-stdlib-jre7";
+			return "kotlin-stdlib-jdk7";
 		}
-		return "kotlin-stdlib-jre8";
+		return "kotlin-stdlib-jdk8";
 	}
 
 	private static boolean isJava8OrLater(ProjectRequest request) {
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
index cb17a3b1..9311ed5d 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
@@ -31,7 +31,7 @@ repositories {
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter')
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}")
+	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion}")
 	compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
index bdd82b1e..53ded534 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
@@ -40,7 +40,7 @@ repositories {
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter')
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jre8")
+	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 	compile("org.jetbrains.kotlin:kotlin-reflect")
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
index 3f9fe445..41aa453a 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
@@ -40,7 +40,7 @@ repositories {
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter')
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jre8")
+	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 	compile("org.jetbrains.kotlin:kotlin-reflect")
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
index 46ed2e86..fc0eab6d 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
@@ -40,7 +40,7 @@ repositories {
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter')
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
+	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
 	compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
index 38882147..4cab9780 100644
--- a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
@@ -37,7 +37,7 @@ repositories {
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter')
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
+	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
 	compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
index f40456b7..766947e2 100644
--- a/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jre8</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
 			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
diff --git a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
index 790a35b4..e9918818 100644
--- a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
@@ -41,7 +41,7 @@ configurations {
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-web')
-	compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
+	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
 	compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
 	testCompile('org.springframework.boot:spring-boot-starter-test')
diff --git a/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
index 74fb9cd7..7a9ae5ef 100644
--- a/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jre8</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
 			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
index fd2a68f7..ee036958 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jre7</artifactId>
+			<artifactId>kotlin-stdlib-jdk7</artifactId>
 			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
index f9be1151..0fd466b0 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jre8</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
index 31cb04fb..f237c8c8 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jre8</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
 			<version>${kotlin.version}</version>
 		</dependency>
 		<dependency>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
index 0614aae9..13d6c03b 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jre8</artifactId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
diff --git a/initializr-service/src/main/resources/application.yml b/initializr-service/src/main/resources/application.yml
index 80e4bed4..66a6af8d 100644
--- a/initializr-service/src/main/resources/application.yml
+++ b/initializr-service/src/main/resources/application.yml
@@ -146,7 +146,7 @@ initializr:
     gradle:
       dependency-management-plugin-version: 0.6.0.RELEASE
     kotlin:
-      default-version: 1.2.10
+      default-version: 1.2.20
   dependencies:
     - name: Core
       content:
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
index e718177c..6e2217f4 100644
--- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -192,7 +192,7 @@ public class ProjectGenerationSmokeTests
 		projectAssert.hasBaseDir("demo").isMavenProject().isKotlinProject()
 				.hasStaticAndTemplatesResources(false).pomAssert().hasDependenciesCount(4)
 				.hasSpringBootStarterRootDependency().hasSpringBootStarterTest()
-				.hasDependency("org.jetbrains.kotlin", "kotlin-stdlib-jre8")
+				.hasDependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
 				.hasDependency("org.jetbrains.kotlin", "kotlin-reflect");
 	}