1 files changed, 3 insertions, 10 deletions
diff --git a/src/Language/SimpleShell/AST/Expr.hs b/src/Language/SimpleShell/AST/Expr.hs
index 0aaf16d..53b33f4 100644
--- a/src/Language/SimpleShell/AST/Expr.hs
+++ b/src/Language/SimpleShell/AST/Expr.hs
@@ -1,19 +1,12 @@
 module Language.SimpleShell.AST.Expr
   ( Expr(..)
   , TypedExpr
-  , VarName
-  , FunName
   )
 where
 
 
-import Language.SimpleShell.AST.SimpleType (SimpleType)
-
-import Data.Text (Text)
-
-
-type VarName = Text
-type FunName = Text
+import Language.SimpleShell.AST.Name (FunName, VarName)
+import Language.SimpleShell.AST.SimpleType (Typed)
 
 
 -- | Pure expression (no side effects).
@@ -44,4 +37,4 @@ data Expr
   | StrCast Expr
  deriving (Show)
 
-type TypedExpr = (SimpleType, Expr)
+type TypedExpr = Typed Expr