diff --git a/core-java/src/main/java/com/baeldung/keyword/KeywordDemo.java b/core-java/src/main/java/com/baeldung/keyword/KeywordDemo.java
index 7d87aece86..ba27fe0df6 100644
--- a/core-java/src/main/java/com/baeldung/keyword/KeywordDemo.java
+++ b/core-java/src/main/java/com/baeldung/keyword/KeywordDemo.java
@@ -1,6 +1,6 @@
 package com.baeldung.keyword;
 
-import com.baeldung.keyword.superkeyword.SubClass;
+import com.baeldung.keyword.superkeyword.SuperSub;
 import com.baeldung.keyword.thiskeyword.ThisKeyword;
 
 /**
@@ -11,6 +11,6 @@ public class KeywordDemo {
     public static void main(String[] args) {
         ThisKeyword keyword = new ThisKeyword();
 
-        SubClass child = new SubClass("message from the child class");
+        SuperSub child = new SuperSub("message from the child class");
     }
 }
diff --git a/core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperKeyword.java b/core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java
similarity index 72%
rename from core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperKeyword.java
rename to core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java
index 8f6ea05d26..a5304fcef9 100644
--- a/core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperKeyword.java
+++ b/core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperBase.java
@@ -3,14 +3,14 @@ package com.baeldung.keyword.superkeyword;
 /**
  * Created by Gebruiker on 5/14/2018.
  */
-public class SuperKeyword {
+public class SuperBase {
 
     String message = "super class";
 
-    public SuperKeyword() {
+    public SuperBase() {
     }
 
-    public SuperKeyword(String message) {
+    public SuperBase(String message) {
         this.message = message;
     }
 
diff --git a/core-java/src/main/java/com/baeldung/keyword/superkeyword/SubClass.java b/core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java
similarity index 78%
rename from core-java/src/main/java/com/baeldung/keyword/superkeyword/SubClass.java
rename to core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java
index 7179447fcb..83bc04ad0f 100644
--- a/core-java/src/main/java/com/baeldung/keyword/superkeyword/SubClass.java
+++ b/core-java/src/main/java/com/baeldung/keyword/superkeyword/SuperSub.java
@@ -3,15 +3,15 @@ package com.baeldung.keyword.superkeyword;
 /**
  * Created by Gebruiker on 5/15/2018.
  */
-public class SubClass extends SuperKeyword {
+public class SuperSub extends SuperBase {
 
     String message = "child class";
 
-    public SubClass(String message) {
+    public SuperSub(String message) {
         super(message);
     }
 
-    public SubClass() {
+    public SuperSub() {
         super.printMessage();
         printMessage();
     }