diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle
index 54eee926bb..b35241c6d6 100644
--- a/config/spring-security-config.gradle
+++ b/config/spring-security-config.gradle
@@ -12,7 +12,7 @@ dependencies {
 	optional project(':spring-security-ldap')
 	optional project(':spring-security-messaging')
 	optional project(':spring-security-oauth2-client')
-	optional project(':spring-security-jwt-jose')
+	optional project(':spring-security-oauth2-jose')
 	optional project(':spring-security-openid')
 	optional project(':spring-security-web')
 	optional 'io.projectreactor:reactor-core'
diff --git a/oauth2/oauth2-client/spring-security-oauth2-client.gradle b/oauth2/oauth2-client/spring-security-oauth2-client.gradle
index ccb833e898..7ac0a79764 100644
--- a/oauth2/oauth2-client/spring-security-oauth2-client.gradle
+++ b/oauth2/oauth2-client/spring-security-oauth2-client.gradle
@@ -7,7 +7,7 @@ dependencies {
 	compile springCoreDependency
 	compile 'com.nimbusds:oauth2-oidc-sdk'
 
-	optional project(':spring-security-jwt-jose')
+	optional project(':spring-security-oauth2-jose')
 
 	provided 'javax.servlet:javax.servlet-api'
 }
diff --git a/oauth2/jwt-jose/spring-security-jwt-jose.gradle b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
similarity index 100%
rename from oauth2/jwt-jose/spring-security-jwt-jose.gradle
rename to oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jose/jws/JwsAlgorithm.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jose/jws/JwsAlgorithm.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jose/jws/JwsAlgorithm.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jose/jws/JwsAlgorithm.java
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/Jwt.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/Jwt.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/Jwt.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/Jwt.java
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaim.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaim.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaim.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaim.java
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimAccessor.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimAccessor.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimAccessor.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimAccessor.java
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoder.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoder.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoder.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoder.java
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtException.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtException.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtException.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtException.java
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java
similarity index 100%
rename from oauth2/jwt-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java
rename to oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java
diff --git a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle
index 6e682620a1..238cea2470 100644
--- a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle
+++ b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle
@@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
 dependencies {
 	compile project(':spring-security-config')
 	compile project(':spring-security-oauth2-client')
-	compile project(':spring-security-jwt-jose')
+	compile project(':spring-security-oauth2-jose')
 	compile 'org.springframework:spring-webflux'
 	compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	compile 'org.springframework.boot:spring-boot-starter-web'