diff --git a/polymod/hscript/_internal/Expr.hx b/polymod/hscript/_internal/Expr.hx
index 36370cf2..a90350c2 100644
--- a/polymod/hscript/_internal/Expr.hx
+++ b/polymod/hscript/_internal/Expr.hx
@@ -303,6 +303,7 @@ typedef EnumDecl =
 {
   > ModuleType,
   var fields:Array<EnumFieldDecl>;
+  @:optional var pkg:Array<String>;
 }
 
 typedef EnumFieldDecl =
diff --git a/polymod/hscript/_internal/PolymodEnum.hx b/polymod/hscript/_internal/PolymodEnum.hx
index 4be7a984..508a82ab 100644
--- a/polymod/hscript/_internal/PolymodEnum.hx
+++ b/polymod/hscript/_internal/PolymodEnum.hx
@@ -8,13 +8,13 @@ class PolymodEnum
 {
   private static final scriptInterp = new PolymodInterpEx(null, null);
 
-  private var _e:PolymodEnumDeclEx;
+  private var _e:EnumDecl;
 
   private var _value:String;
 
   private var _args:Array<Dynamic>;
 
-  public function new(e:PolymodEnumDeclEx, value:String, args:Array<Dynamic>)
+  public function new(e:EnumDecl, value:String, args:Array<Dynamic>)
   {
     this._e = e;
 
diff --git a/polymod/hscript/_internal/PolymodEnumDeclEx.hx b/polymod/hscript/_internal/PolymodEnumDeclEx.hx
deleted file mode 100644
index bc62288e..00000000
--- a/polymod/hscript/_internal/PolymodEnumDeclEx.hx
+++ /dev/null
@@ -1,10 +0,0 @@
-package polymod.hscript._internal;
-
-import polymod.hscript._internal.Expr;
-
-typedef PolymodEnumDeclEx =
-{
-  > EnumDecl,
-
-  @:optional var pkg:Array<String>;
-}
diff --git a/polymod/hscript/_internal/PolymodInterpEx.hx b/polymod/hscript/_internal/PolymodInterpEx.hx
index 64a3d9c9..43a5fa9f 100644
--- a/polymod/hscript/_internal/PolymodInterpEx.hx
+++ b/polymod/hscript/_internal/PolymodInterpEx.hx
@@ -290,9 +290,9 @@ class PolymodInterpEx extends Interp
     return _scriptClassDescriptors.get(name);
   }
 
-  private static var _scriptEnumDescriptors:Map<String, PolymodEnumDeclEx> = new Map<String, PolymodEnumDeclEx>();
+  private static var _scriptEnumDescriptors:Map<String, EnumDecl> = new Map<String, EnumDecl>();
 
-  private static function registerScriptEnum(e:PolymodEnumDeclEx)
+  private static function registerScriptEnum(e:EnumDecl)
   {
     var name = e.name;
     if (e.pkg != null)
@@ -2372,7 +2372,7 @@ class PolymodInterpEx extends Interp
               });
           }
 
-          var enumDecl:PolymodEnumDeclEx =
+          var enumDecl:EnumDecl =
             {
               pkg: pkg,
               name: e.name,