diff --git a/src-derived/Order.hs b/src-derived/Order.hs
--- a/src-derived/Order.hs
+++ b/src-derived/Order.hs
@@ -66,7 +66,7 @@
 
 
 getNtName :: Type -> NontermIdent
-getNtName (NT nt _) = nt
+getNtName (NT nt _) = maybe nt id (deforestedNt nt)
 getNtName _         = nullIdent
 
 
diff --git a/src/CommonTypes.hs b/src/CommonTypes.hs
--- a/src/CommonTypes.hs
+++ b/src/CommonTypes.hs
@@ -149,8 +149,9 @@
 isSELFNonterminal (NT nt _) | nt == _SELF = True
 isSELFNonterminal _                       = False
 
+-- TODO: check if the name needs to be converted if the name is T_
 extractNonterminal :: Type -> NontermIdent
-extractNonterminal (NT n _) = n
+extractNonterminal (NT n _) = maybe n id (deforestedNt n)
 
 nontermArgs :: Type -> [String]
 nontermArgs tp
diff --git a/src/Version.hs b/src/Version.hs
--- a/src/Version.hs
+++ b/src/Version.hs
@@ -1,4 +1,4 @@
 module Version where
 
 banner :: String
-banner = "Attribute Grammar compiler / HUT project. Version 0.9.15"
+banner = "Attribute Grammar compiler / HUT project. Version 0.9.16"
diff --git a/uuagc.cabal b/uuagc.cabal
--- a/uuagc.cabal
+++ b/uuagc.cabal
@@ -1,7 +1,7 @@
 cabal-version: >=1.2
 build-type: Simple
 name: uuagc
-version: 0.9.15
+version: 0.9.16
 license: GPL
 license-file: LICENSE
 maintainer: Arie Middelkoop <ariem@cs.uu.nl>
diff --git a/uuagc.cabal-for-ghc-6.6 b/uuagc.cabal-for-ghc-6.6
--- a/uuagc.cabal-for-ghc-6.6
+++ b/uuagc.cabal-for-ghc-6.6
@@ -1,5 +1,5 @@
 name: uuagc
-version: 0.9.15
+version: 0.9.16
 license: GPL
 license-file: LICENSE
 maintainer: Arie Middelkoop <ariem@cs.uu.nl>