diff --git a/lib/modules/Thread.pmod b/lib/modules/Thread.pmod
index 026f912f76f5562f4e6a06675f911e1d3addff56..c5cd1c6a66047c20f6f4a2d89fb9d5e2281ae52d 100644
--- a/lib/modules/Thread.pmod
+++ b/lib/modules/Thread.pmod
@@ -2,9 +2,9 @@ constant Mutex=__builtin.Mutex;
 constant Condition=__builtin.Condition;
 
 class Fifo {
-  inherit Builtin.condition : r_cond;
-  inherit Builtin.condition: w_cond;
-  inherit Builtin.mutex: lock;
+  inherit Condition : r_cond;
+  inherit Condition: w_cond;
+  inherit Mutex: lock;
   
   mixed *buffer;
   int r_ptr, w_ptr;
@@ -38,8 +38,8 @@ class Fifo {
 };
 
 class Queue {
-  inherit Builtin.condition: r_cond;
-  inherit Builtin.mutex: lock;
+  inherit Condition: r_cond;
+  inherit Mutex: lock;
   
   mixed *buffer=allocate(16);
   int r_ptr, w_ptr;