diff --git a/src/main/grammar/Grammar.bnf b/src/main/grammar/Grammar.bnf
index 5de306140c7aea29b0cc1fa45f6eb812fe8a9680..d5165bdf1842a9de8abb50ca3056f4d508e986c4 100644
--- a/src/main/grammar/Grammar.bnf
+++ b/src/main/grammar/Grammar.bnf
@@ -22,7 +22,7 @@ comment ::= (WHITESPACE | MULTILINECOMMENT | DOCCOMMENT | SINGLELINECOMMENT)
 type_decl ::= ABSTRACT? declared_name (COL type_reference)? (ASSIGN (component | nta_component)*)? SCOL
 {
   extends="org.jastadd.tooling.grammar.psi.impl.GrammarTypeDeclImplExtension"
-  implements="org.jastadd.tooling.grammar.psi.GrammarTypeDeclExtension"
+  implements="org.jastadd.tooling.grammar.psi.GrammarNamedElement"
 }
 
 nta_component ::= SLASH component SLASH
@@ -46,7 +46,7 @@ declared_name ::= ID
 type_reference ::= ID
 {
   extends="org.jastadd.tooling.grammar.psi.impl.GrammarTypeReferenceImplExtension"
-  implements="org.jastadd.tooling.grammar.psi.GrammarTypeReferenceExtension"
+  implements="org.jastadd.tooling.grammar.psi.GrammarNamedElement"
 }
 
 java_name ::= ID
diff --git a/src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeDeclExtension.java b/src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeDeclExtension.java
deleted file mode 100644
index 3459b1aca8435d9392d54556a96365d08491e3f1..0000000000000000000000000000000000000000
--- a/src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeDeclExtension.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.jastadd.tooling.grammar.psi;
-
-public interface GrammarTypeDeclExtension extends GrammarNamedElement {
-}
diff --git a/src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeReferenceExtension.java b/src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeReferenceExtension.java
deleted file mode 100644
index c9cbb3c9089193483e7a999be66b1b9400a03a0f..0000000000000000000000000000000000000000
--- a/src/main/java/org/jastadd/tooling/grammar/psi/GrammarTypeReferenceExtension.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.jastadd.tooling.grammar.psi;
-
-public interface GrammarTypeReferenceExtension extends GrammarNamedElement {
-}
diff --git a/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeDeclImplExtension.java b/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeDeclImplExtension.java
index 8df00b485a450166dae96f9b694d23c09b97ed54..8634701910da77b6fe07964d9cf25f9d3556e141 100644
--- a/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeDeclImplExtension.java
+++ b/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeDeclImplExtension.java
@@ -5,10 +5,10 @@ import com.intellij.psi.PsiElement;
 import org.jastadd.tooling.grammar.parser.GrammarTypes;
 import org.jastadd.tooling.grammar.psi.GrammarDeclaredName;
 import org.jastadd.tooling.grammar.psi.GrammarElementFactory;
-import org.jastadd.tooling.grammar.psi.GrammarTypeDeclExtension;
+import org.jastadd.tooling.grammar.psi.GrammarNamedElement;
 import org.jetbrains.annotations.NotNull;
 
-public class GrammarTypeDeclImplExtension extends GrammarNamedElementImpl implements GrammarTypeDeclExtension {
+public class GrammarTypeDeclImplExtension extends GrammarNamedElementImpl implements GrammarNamedElement {
 
   public GrammarTypeDeclImplExtension(@NotNull ASTNode node) {
     super(node);
diff --git a/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeReferenceImplExtension.java b/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeReferenceImplExtension.java
index 495e20e17f1a30459b97257765e10ea10126de23..388b9129f3e99b0f3949099ef88616bf202632cd 100644
--- a/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeReferenceImplExtension.java
+++ b/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarTypeReferenceImplExtension.java
@@ -3,11 +3,11 @@ package org.jastadd.tooling.grammar.psi.impl;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jastadd.tooling.grammar.psi.GrammarElementFactory;
+import org.jastadd.tooling.grammar.psi.GrammarNamedElement;
 import org.jastadd.tooling.grammar.psi.GrammarTypeReference;
-import org.jastadd.tooling.grammar.psi.GrammarTypeReferenceExtension;
 import org.jetbrains.annotations.NotNull;
 
-public class GrammarTypeReferenceImplExtension extends GrammarNamedElementImpl implements GrammarTypeReferenceExtension {
+public class GrammarTypeReferenceImplExtension extends GrammarNamedElementImpl implements GrammarNamedElement {
 
   public GrammarTypeReferenceImplExtension(@NotNull ASTNode node) {
     super(node);