diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectReferenceContributor.java b/src/main/java/org/jastadd/tooling/aspect/AspectReferenceContributor.java
index 5d993a175373ee059726139a39179607a5ccb575..6a86c3afbc287f5c9adb6b884c44ca521680b306 100644
--- a/src/main/java/org/jastadd/tooling/aspect/AspectReferenceContributor.java
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectReferenceContributor.java
@@ -19,8 +19,8 @@ public class AspectReferenceContributor extends PsiReferenceContributor {
         @Override
         public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element,
                                                                @NotNull ProcessingContext context) {
-          JastAddAspectAstTypeName typeReference = (JastAddAspectAstTypeName) element;
-          String value = typeReference.getText();
+          JastAddAspectAstTypeName astTypeName = (JastAddAspectAstTypeName) element;
+          String value = astTypeName.getText();
           if (value != null) {
             TextRange range = new TextRange(0, value.length());
             return new PsiReference[]{new GrammarReference(element, range)};
@@ -34,9 +34,9 @@ public class AspectReferenceContributor extends PsiReferenceContributor {
         @Override
         public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element,
                                                                @NotNull ProcessingContext context) {
-          JastAddAspectClassOrInterfaceType typeReference = (JastAddAspectClassOrInterfaceType) element;
-          if (typeReference.getTypeArgumentsList().isEmpty() && typeReference.getJavaIdentifierList().size() == 1) {
-            String value = typeReference.getJavaIdentifierList().get(0).getText();
+          JastAddAspectClassOrInterfaceType classOrInterfaceType = (JastAddAspectClassOrInterfaceType) element;
+          if (classOrInterfaceType.getTypeArgumentsList().isEmpty() && classOrInterfaceType.getJavaIdentifierList().size() == 1) {
+            String value = classOrInterfaceType.getJavaIdentifierList().get(0).getText();
             if (value != null) {
               TextRange range = new TextRange(0, value.length());
               return new PsiReference[]{new GrammarReference(element, range)};
diff --git a/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectAstTypeNameImplExtension.java b/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectAstTypeNameImplExtension.java
index a362105f8536969966718982ad9f88c553b89b92..c83758eea7659596e84856ed3d74ea7440cb1bde 100644
--- a/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectAstTypeNameImplExtension.java
+++ b/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectAstTypeNameImplExtension.java
@@ -24,6 +24,7 @@ public class JastAddAspectAstTypeNameImplExtension extends GrammarNamedElementIm
     ASTNode keyNode = getNode().getFirstChildNode();
     if (keyNode != null) {
       JastAddAspectAstTypeName name = AspectElementFactory.createAstTypeName(getProject(), newName);
+      assert name != null; // we know the name is not null because we always create the same one
       ASTNode newKeyNode = name.getNode().getFirstChildNode();
       getNode().replaceChild(keyNode, newKeyNode);
     }
diff --git a/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectClassOrInterfaceTypeImplExtension.java b/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectClassOrInterfaceTypeImplExtension.java
index 26927ffe375806d4f892a885596842db8665395e..ca1542e8db7756b3ad81660546a929b38fb3278d 100644
--- a/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectClassOrInterfaceTypeImplExtension.java
+++ b/src/main/java/org/jastadd/tooling/aspect/psi/impl/JastAddAspectClassOrInterfaceTypeImplExtension.java
@@ -24,6 +24,7 @@ public class JastAddAspectClassOrInterfaceTypeImplExtension extends GrammarNamed
     ASTNode keyNode = getNode().getFirstChildNode();
     if (keyNode != null) {
       JastAddAspectClassOrInterfaceType name = AspectElementFactory.createClassOrInterfaceType(getProject(), newName);
+      assert name != null; // we know the name is not null because we always create the same one
       ASTNode newKeyNode = name.getNode().getFirstChildNode();
       getNode().replaceChild(keyNode, newKeyNode);
     }
diff --git a/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarComponentNameImplExtension.java b/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarComponentNameImplExtension.java
index c598375ba03d46153e4cb6c68b3fe1f1b3c3421c..8f4fc2504ff8fba1970c99bf9c7dd81ba568abda 100644
--- a/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarComponentNameImplExtension.java
+++ b/src/main/java/org/jastadd/tooling/grammar/psi/impl/GrammarComponentNameImplExtension.java
@@ -5,7 +5,6 @@ import com.intellij.psi.PsiElement;
 import org.jastadd.tooling.grammar.psi.GrammarComponentName;
 import org.jastadd.tooling.grammar.psi.GrammarElementFactory;
 import org.jastadd.tooling.grammar.psi.GrammarNamedElement;
-import org.jastadd.tooling.grammar.psi.GrammarTypeName;
 import org.jetbrains.annotations.NotNull;
 
 public class GrammarComponentNameImplExtension extends GrammarNamedElementImpl implements GrammarNamedElement {