diff --git a/compiler/Java_CodeGen.jrag b/compiler/Java_CodeGen.jrag
index 389b0e542a7bfd0d81539bb4fca19abe51544d2f..c21260b249922d3fba854ce0b298d09e09dbb6b9 100644
--- a/compiler/Java_CodeGen.jrag
+++ b/compiler/Java_CodeGen.jrag
@@ -278,11 +278,11 @@ aspect Java_Class {
       }
 
       env.println("import java.io.IOException;");
-      env.println("import se.lth.control.labcomm"+env.verStr+".Type;");
+      env.println("import se.lth.control.labcomm"+env.verStr+".SampleType;");
       env.println("import se.lth.control.labcomm"+env.verStr+".Encoder;");
       env.println("import se.lth.control.labcomm"+env.verStr+".Decoder;");
       env.println();
-      env.println("public class " + getName() + " implements Type {");
+      env.println("public class " + getName() + " implements SampleType {");
       env.println();
       env.indent();
       getType().Java_emitInstance(env);
diff --git a/lib/java/Makefile b/lib/java/Makefile
index 47b112cc2b78496cafc8c2972300aabe2f4bebd7..58ee2689eb6e823da1765f2b152aa5908dc6b70f 100644
--- a/lib/java/Makefile
+++ b/lib/java/Makefile
@@ -9,7 +9,7 @@ MODULES=Constant \
 	Sample \
 	SampleDispatcher \
 	SampleHandler \
-	Type \
+	SampleType \
 	Writer \
 	WriterWrapper
 
diff --git a/lib/java/se/lth/control/labcomm/Type.java b/lib/java/se/lth/control/labcomm/SampleType.java
similarity index 51%
rename from lib/java/se/lth/control/labcomm/Type.java
rename to lib/java/se/lth/control/labcomm/SampleType.java
index 46a5507777be00a7ea2a4d8e9d7610df741a5fc9..f51ce99de5bbf360b8cd319387fd4dcb16b9904a 100644
--- a/lib/java/se/lth/control/labcomm/Type.java
+++ b/lib/java/se/lth/control/labcomm/SampleType.java
@@ -1,5 +1,5 @@
 package se.lth.control.labcomm;
 
-public interface Type {
+public interface SampleType {
 
-}
\ No newline at end of file
+}
diff --git a/lib/java/se/lth/control/labcomm2006/Type.java b/lib/java/se/lth/control/labcomm2006/SampleType.java
similarity index 54%
rename from lib/java/se/lth/control/labcomm2006/Type.java
rename to lib/java/se/lth/control/labcomm2006/SampleType.java
index 63646a0f777b9a16e24350180f8f7e8c750fc63d..932d0d91fd489616395e8314747f3d53c1d7e1f7 100644
--- a/lib/java/se/lth/control/labcomm2006/Type.java
+++ b/lib/java/se/lth/control/labcomm2006/SampleType.java
@@ -1,5 +1,5 @@
 package se.lth.control.labcomm2006;
 
-public interface Type {
+public interface SampleType {
 
-}
\ No newline at end of file
+}