diff --git a/lib/modules/Thread.pmod b/lib/modules/Thread.pmod
index 433efa434fb69b0af386af965ac1e0eef35e2c74..026f912f76f5562f4e6a06675f911e1d3addff56 100644
--- a/lib/modules/Thread.pmod
+++ b/lib/modules/Thread.pmod
@@ -1,5 +1,5 @@
-constant Mutex=_static_modules.Builtin.Mutex;
-constant Condition=_static_modules.Builtin.Condition;
+constant Mutex=__builtin.Mutex;
+constant Condition=__builtin.Condition;
 
 class Fifo {
   inherit Builtin.condition : r_cond;
diff --git a/lib/modules/__builtin.pmod b/lib/modules/__builtin.pmod
new file mode 100644
index 0000000000000000000000000000000000000000..6d1f276f956d27061cbe01d508ab9841d886e0a9
--- /dev/null
+++ b/lib/modules/__builtin.pmod
@@ -0,0 +1 @@
+inherit _static_modules.Builtin;