diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/typesystem.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/typesystem.kt
index badabf8c2..94cd6b7fb 100644
--- a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/typesystem.kt
+++ b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/typesystem.kt
@@ -111,7 +111,7 @@ object KListType : Type() {
  * @property isQualified a boolean property that indicates if the data structure is qualified
  */
 @Serializable
-sealed class QualifiedDataStructureType() : Type() {
+sealed class AbstractDataStructureType() : Type() {
     abstract val isQualified: Boolean
 }
 
@@ -120,7 +120,7 @@ data class DataStructureType(
     var fields: List<FieldType>,
     val elementSize: Int,
     override val isQualified: Boolean = false
-) : QualifiedDataStructureType() {
+) : AbstractDataStructureType() {
     override val size: Int
         get() = elementSize
 }
@@ -135,7 +135,7 @@ data class OccurableDataStructureType(
     val dataStructureType: DataStructureType,
     val occurs: Int,
     override val isQualified: Boolean = false
-) : QualifiedDataStructureType() {
+) : AbstractDataStructureType() {
     override val size: Int
         get() = dataStructureType.size
 }
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/cu_components.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/cu_components.kt
index cb81afc93..04d984c71 100644
--- a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/cu_components.kt
+++ b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/cu_components.kt
@@ -21,7 +21,7 @@ import com.smeup.rpgparser.interpreter.AbstractDataDefinition
 import com.smeup.rpgparser.interpreter.DataDefinition
 import com.smeup.rpgparser.interpreter.FileDefinition
 import com.smeup.rpgparser.interpreter.InStatementDataDefinition
-import com.smeup.rpgparser.interpreter.QualifiedDataStructureType
+import com.smeup.rpgparser.interpreter.AbstractDataStructureType
 import com.smeup.rpgparser.parsing.facade.CopyBlocks
 import com.smeup.rpgparser.parsing.parsetreetoast.removeDuplicatedDataDefinition
 import com.strumenta.kolasu.model.*
@@ -93,7 +93,7 @@ data class CompilationUnit(
                 _allDataDefinitions.addAll(dataDefinitions)
                 // Adds unqualified DS sub-fields
                 dataDefinitions.forEach { dataDefinition ->
-                    if (dataDefinition.type is QualifiedDataStructureType && !(dataDefinition.type as QualifiedDataStructureType).isQualified) {
+                    if (dataDefinition.type is AbstractDataStructureType && !(dataDefinition.type as AbstractDataStructureType).isQualified) {
                         dataDefinition.fields.let { _allDataDefinitions.addAll(it) }
                     }
                 }