diff --git a/lib/risc/assembler.rb b/lib/risc/assembler.rb
index 31a4aea2..81371db5 100644
--- a/lib/risc/assembler.rb
+++ b/lib/risc/assembler.rb
@@ -23,8 +23,8 @@ module Risc
     def assemble
       at = 0
       #need the initial jump at 0 and then functions
-      @machine.init.set_position( 0)
-      at = @machine.init.byte_length
+      @machine.cpu_init.set_position( 0)
+      at = @machine.cpu_init.byte_length
       at = assemble_objects( at )
       # and then everything code
       asseble_code_from(  at )
@@ -38,7 +38,7 @@ module Risc
         objekt.create_binary if objekt.is_a? Parfait::TypedMethod
         binary = objekt.binary
         Positioned.set_position(binary,at)
-        objekt.instructions.set_position( at + 12) # BinaryCode header
+        objekt.risc_instructions.set_position( at + 12) # BinaryCode header
         len = 4 * 14
         at += binary.padded_length
         nekst = binary.next
@@ -58,7 +58,7 @@ module Risc
       at +=  8 # thats the padding
       # want to have the objects first in the executable
       @objects.each do | id , objekt|
-        next if objekt.is_a? Risc::Label # will get assembled as method.instructions
+        next if objekt.is_a? Risc::Label # will get assembled as method.risc_instructions
         next if objekt.is_a? Parfait::BinaryCode
         Positioned.set_position(objekt,at)
         at += objekt.padded_length
@@ -132,10 +132,10 @@ module Risc
     # and then plonk that binary data into the method.code array
     def assemble_binary_method method
       stream = StringIO.new
-      #puts "Method #{method.source.instructions.to_ac}"
+      #puts "Method #{method.source.risc_instructions.to_ac}"
       begin
-        #puts "assemble #{method.source.instructions}"
-        method.instructions.assemble_all( stream )
+        #puts "assemble #{method.source.risc_instructions}"
+        method.risc_instructions.assemble_all( stream )
       rescue => e
         log.debug "Assembly error #{method.name}\n#{method.to_rxf.to_s[0...2000]}"
         raise e
@@ -155,7 +155,7 @@ module Risc
       stream.rewind
       length = stream.length
       binary = method.binary
-      total_byte_length = method.instructions.total_byte_length
+      total_byte_length = method.risc_instructions.total_byte_length
       log.debug "Assembled code #{method.name} with length #{length}"
       raise "length error #{binary.char_length} != #{total_byte_length}" if binary.char_length <= total_byte_length
       raise "length error #{length} != #{total_byte_length}" if total_byte_length != length
diff --git a/lib/risc/machine.rb b/lib/risc/machine.rb
index bfe7e217..4139c1da 100644
--- a/lib/risc/machine.rb
+++ b/lib/risc/machine.rb
@@ -20,39 +20,28 @@ module Risc
       @booted = false
       @constants = []
     end
-    attr_reader  :constants , :init  , :booted
+    attr_reader  :constants , :risc_init , :cpu_init  , :booted
 
     # idea being that later method missing could catch translate_xxx and translate to target xxx
     # now we just instantiate ArmTranslater and pass instructions
     def translate_arm
       methods = Parfait.object_space.collect_methods
       translate_methods( methods )
-      label = @init.next
-      @init = Arm::Translator.new.translate( @init )
-      @init.append label
+      @cpu_init = Arm::Translator.new.translate( @risc_init )
     end
 
     def translate_methods(methods)
       translator = Arm::Translator.new
       methods.each do |method|
         log.debug "Translate method #{method.name}"
-        instruction = method.instructions
-        while instruction.next
-          nekst = instruction.next
-          t = translator.translate(nekst) # returning nil means no replace
-          if t
-            nekst = t.last
-            instruction.replace_next(t)
-          end
-          instruction = nekst
-        end
+        method.translate_cpu(translator)
       end
     end
 
     def boot
       initialize
       boot_parfait!
-      @init =  Branch.new( "__initial_branch__" , Parfait.object_space.get_init.instructions )
+      @risc_init = Branch.new( "__initial_branch__" , Parfait.object_space.get_init.risc_instructions )
       @booted = true
       self
     end
@@ -69,13 +58,4 @@ module Risc
 
 end
 
-Parfait::TypedMethod.class_eval do
-  # for testing we need to reuse the main function (or do we?)
-  # so remove the code that is there
-  def clear_source
-    self.source.send :initialize , self
-  end
-
-end
-
 require_relative "boot"
diff --git a/test/risc/interpreter/helper.rb b/test/risc/interpreter/helper.rb
index 640a933b..85cc6695 100644
--- a/test/risc/interpreter/helper.rb
+++ b/test/risc/interpreter/helper.rb
@@ -13,7 +13,7 @@ module Risc
       Vool::VoolCompiler.ruby_to_vool( @string_input )
       Collector.collect_space
       @interpreter = Interpreter.new
-      @interpreter.start Risc.machine.init
+      @interpreter.start Risc.machine.risc_init
     end
 
     # must be after boot, but before main compile, to define method