diff --git a/src/main/java/org/ntlab/rdlworkbench/ast/FieldDeclaration.java b/src/main/java/org/ntlab/rdlworkbench/ast/FieldDeclaration.java
index 54c1b6d..bae5b17 100644
--- a/src/main/java/org/ntlab/rdlworkbench/ast/FieldDeclaration.java
+++ b/src/main/java/org/ntlab/rdlworkbench/ast/FieldDeclaration.java
@@ -1,7 +1,5 @@
 package org.ntlab.rdlworkbench.ast;
 
-import models.algebra.Type;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -77,12 +75,12 @@
 			code += annotation.toString() + "\n";
 		}
 		if (initializationBlock != null) {
-			code += "private " + type.getInterfaceTypeName() + " " + fieldName + ";\n" + initializationBlock + "\n";
+			code += "private " + type.toString() + " " + fieldName + ";\n" + initializationBlock + "\n";
 		} else {
 			if (initializer == null) {
-				code += "private " + type.getInterfaceTypeName() + " " + fieldName + ";\n";
+				code += "private " + type.toString() + " " + fieldName + ";\n";
 			} else {
-				code += "private " + type.getInterfaceTypeName() + " " + fieldName + " = " + initializer + ";\n";
+				code += "private " + type.toString() + " " + fieldName + " = " + initializer + ";\n";
 			}
 		}
 		return code;
diff --git a/src/main/java/org/ntlab/rdlworkbench/ast/Type.java b/src/main/java/org/ntlab/rdlworkbench/ast/Type.java
index b7a3c0f..d15e4b2 100644
--- a/src/main/java/org/ntlab/rdlworkbench/ast/Type.java
+++ b/src/main/java/org/ntlab/rdlworkbench/ast/Type.java
@@ -7,7 +7,7 @@
  *
  * @author s-yamagiwa
  */
-public abstract class Type extends ASTNode implements models.algebra.Type.ITypeImpl {
+public abstract class Type extends ASTNode {
 	/**
 	 * Returns whether this type is a primitive type or not.
 	 *
diff --git a/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclaration.java b/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclaration.java
index 0ccc1de..a867acc 100644
--- a/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclaration.java
+++ b/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclaration.java
@@ -1,7 +1,5 @@
 package org.ntlab.rdlworkbench.ast;
 
-import models.algebra.Type;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -59,7 +57,7 @@
 
 	public String toString() {
 		String code = "";
-		code += type.getInterfaceTypeName() + " " + variableName;
+		code += type.toString() + " " + variableName;
 		if (optionalInitializer != null) {
 			code += " = " + optionalInitializer;
 		}
diff --git a/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclarationStatement.java b/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclarationStatement.java
index 9acb400..b577633 100644
--- a/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclarationStatement.java
+++ b/src/main/java/org/ntlab/rdlworkbench/ast/VariableDeclarationStatement.java
@@ -1,7 +1,5 @@
 package org.ntlab.rdlworkbench.ast;
 
-import models.algebra.Type;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,7 +66,7 @@
         }
 
         if (this.type != null) {
-            sb.append(this.type.getInterfaceTypeName()).append(" ");
+            sb.append(this.type.toString()).append(" ");
         }
 
         for (int i = 0; i < fragments.size(); i++) {