diff --git a/lib/parfait/array.rb b/lib/parfait/array.rb
index 492c5cd7..be6b9859 100644
--- a/lib/parfait/array.rb
+++ b/lib/parfait/array.rb
@@ -4,6 +4,6 @@
 class Array < BaseObject
   #many basic array functions can not be defined in ruby, such as
   # get/set/length/add/delete
-  # so they must be defined as CompiledMethods in Salama::Kernel
+  # so they must be defined as CompiledMethods in Builtin::Kernel
    
 end
diff --git a/lib/virtual/boot_space.rb b/lib/virtual/boot_space.rb
index 3ff129ce..917225f2 100644
--- a/lib/virtual/boot_space.rb
+++ b/lib/virtual/boot_space.rb
@@ -1,5 +1,5 @@
 require "virtual/boot_class"
-require "kernel/object"
+require "builtin/object"
 
 module Virtual
   # The BootSpace contains all objects for a program. In functional terms it is a program, but in oo
@@ -71,20 +71,20 @@ module Virtual
       obj = get_or_create_class :Object
       [:index_of , :_get_instance_variable , :_set_instance_variable].each do |f|
         #puts "Boot Object::#{f}"
-        obj.add_instance_method Salama::Object.send(f , @context)
+        obj.add_instance_method Builtin::Object.send(f , @context)
       end
       [:putstring,:putint,:fibo,:exit].each do |f|
         #puts "Boot Kernel::#{f}"
-        obj.add_instance_method Salama::Kernel.send(f , @context)
+        obj.add_instance_method Builtin::Kernel.send(f , @context)
       end
       obj = get_or_create_class :String
       [:get , :set , :puts].each do |f|
         #puts "Boot String::#{f}"
-        obj.add_instance_method Salama::String.send(f , @context)
+        obj.add_instance_method Builtin::String.send(f , @context)
       end
       obj = get_or_create_class :Array
       [:get , :set , :push].each do |f|
-        obj.add_instance_method Salama::Array.send(f , @context)
+        obj.add_instance_method Builtin::Array.send(f , @context)
       end
     end