diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/BinaryOperatorDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/BinaryOperatorDefinition.java
index 89c99b09..c62499d7 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/BinaryOperatorDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/BinaryOperatorDefinition.java
@@ -77,11 +77,6 @@ public String getName() {
         + this.rhsTypeName.getFullString();
   }
 
-  @Override
-  public String getPackage() {
-    return null;
-  }
-
   @Override
   public MagikDefinition getWithoutNode() {
     return new BinaryOperatorDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ConditionDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ConditionDefinition.java
index e847f604..7edd04bf 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ConditionDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ConditionDefinition.java
@@ -56,11 +56,6 @@ public List<String> getDataNames() {
     return Collections.unmodifiableList(this.dataNames);
   }
 
-  @Override
-  public String getPackage() {
-    return null;
-  }
-
   @Override
   public MagikDefinition getWithoutNode() {
     return new ConditionDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ExemplarDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ExemplarDefinition.java
index 1c8ebb0d..a331f008 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ExemplarDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ExemplarDefinition.java
@@ -103,11 +103,6 @@ public String getName() {
     return this.typeName.getFullString();
   }
 
-  @Override
-  public String getPackage() {
-    return this.typeName.getPakkage();
-  }
-
   @Override
   public ExemplarDefinition getWithoutNode() {
     return new ExemplarDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/GlobalDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/GlobalDefinition.java
index 58656814..c422ec00 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/GlobalDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/GlobalDefinition.java
@@ -47,11 +47,6 @@ public String getName() {
     return this.typeName.getFullString();
   }
 
-  @Override
-  public String getPackage() {
-    return this.typeName.getPakkage();
-  }
-
   @Override
   public GlobalDefinition getWithoutNode() {
     return new GlobalDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/MagikDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/MagikDefinition.java
index 58b5e2f0..447e80ad 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/MagikDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/MagikDefinition.java
@@ -88,14 +88,6 @@ public AstNode getNode() {
    */
   public abstract String getName();
 
-  /**
-   * Get name of package this definition lives in.
-   *
-   * @return Package name.
-   */
-  @CheckForNull
-  public abstract String getPackage();
-
   /**
    * Get a(n equal) copy of self, without the {@link AstNode}.
    *
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/PackageDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/PackageDefinition.java
index 977bc904..4c8e48d7 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/PackageDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/PackageDefinition.java
@@ -44,11 +44,6 @@ public List<String> getUses() {
     return Collections.unmodifiableList(this.uses);
   }
 
-  @Override
-  public String getPackage() {
-    return this.name;
-  }
-
   @Override
   public PackageDefinition getWithoutNode() {
     return new PackageDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ParameterDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ParameterDefinition.java
index 5a2d651d..3de8d0c2 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ParameterDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ParameterDefinition.java
@@ -59,11 +59,6 @@ public TypeString getTypeName() {
     return this.typeName;
   }
 
-  @Override
-  public String getPackage() {
-    return null;
-  }
-
   @Override
   public ParameterDefinition getWithoutNode() {
     return new ParameterDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ProcedureDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ProcedureDefinition.java
index b5f53fbc..5bf0f67a 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ProcedureDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/ProcedureDefinition.java
@@ -218,15 +218,6 @@ public Set<ConditionUsage> getUsedConditions() {
     return Collections.unmodifiableSet(this.usedConditions);
   }
 
-  @Override
-  public String getPackage() {
-    if (this.typeName != null) {
-      return this.typeName.getPakkage();
-    }
-
-    return TypeString.UNDEFINED.getPakkage();
-  }
-
   @Override
   public ProcedureDefinition getWithoutNode() {
     return new ProcedureDefinition(
diff --git a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/SlotDefinition.java b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/SlotDefinition.java
index baf759a9..5fb01eed 100644
--- a/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/SlotDefinition.java
+++ b/magik-squid/src/main/java/nl/ramsolutions/sw/magik/analysis/definitions/SlotDefinition.java
@@ -42,11 +42,6 @@ public TypeString getTypeName() {
     return this.typeName;
   }
 
-  @Override
-  public String getPackage() {
-    return null;
-  }
-
   @Override
   public SlotDefinition getWithoutNode() {
     return new SlotDefinition(