diff --git a/build.gradle b/build.gradle
index 47e8f24f6..a39bc7439 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ allprojects {
 			':smack-bosh',
 			':smack-debug',
 			':smack-debug-slf4j',
-			':smack-java7',
+			':smack-java8',
 			':smack-jingle-old',
 			':smack-resolver-dnsjava',
 			':smack-resolver-javax',
diff --git a/settings.gradle b/settings.gradle
index 875a6e88c..42e83712c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ include 'smack-core',
 		'smack-bosh',
 		'smack-android',
 		'smack-android-extensions',
-		'smack-java7',
+		'smack-java8',
 		'smack-java8-full',
 		'smack-integration-test',
 		'smack-omemo',
diff --git a/smack-java8-full/build.gradle b/smack-java8-full/build.gradle
index 8586a0005..5292c5cff 100644
--- a/smack-java8-full/build.gradle
+++ b/smack-java8-full/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 	api project(':smack-debug')
 	api project(':smack-experimental')
 	api project(':smack-extensions')
-	api project(':smack-java7')
+	api project(':smack-java8')
 	api project(':smack-legacy')
 	api project(':smack-omemo')
 	api project(':smack-openpgp')
diff --git a/smack-java7/build.gradle b/smack-java8/build.gradle
similarity index 100%
rename from smack-java7/build.gradle
rename to smack-java8/build.gradle
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java b/smack-java8/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
similarity index 96%
rename from smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
index 8fbb8c644..e6e2a3d46 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
+++ b/smack-java8/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
@@ -33,7 +33,7 @@ public class Java7SmackInitializer implements SmackInitializer {
         if (SystemUtil.onAndroid()) {
             // @formatter:off
             throw new RuntimeException(
-                            "You need to remove the smack-java7 dependency/jar from your build, " +
+                            "You need to remove the smack-java8 dependency/jar from your build, " +
                             "as it does not run on Android. " +
                             "Use smack-android instead.");
             // @formatter:on
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java b/smack-java8/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
similarity index 100%
rename from smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/package-info.java b/smack-java8/src/main/java/org/jivesoftware/smack/java7/package-info.java
similarity index 100%
rename from smack-java7/src/main/java/org/jivesoftware/smack/java7/package-info.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/java7/package-info.java
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java b/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
similarity index 100%
rename from smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java b/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
similarity index 100%
rename from smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java b/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java
similarity index 100%
rename from smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java b/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java
similarity index 100%
rename from smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java
rename to smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java