diff --git a/lib/origen_sim/origen_testers/api.rb b/lib/origen_sim/origen_testers/api.rb
index 10bcec3..11b2f26 100644
--- a/lib/origen_sim/origen_testers/api.rb
+++ b/lib/origen_sim/origen_testers/api.rb
@@ -89,7 +89,7 @@ def sim_capture(id, *pins)
       options = pins.last.is_a?(Hash) ? pins.pop : {}
       pins = pins.map { |p| p.is_a?(String) || p.is_a?(Symbol) ? dut.pin(p) : p }
       pins.each(&:save)
-      @sim_capture = pins.map { |p| [p, "origen.dut.#{p.rtl_name}"] }
+      @sim_capture = pins.map { |p| [p, "#{simulator.testbench_top || 'origen'}.dut.#{p.rtl_name}"] }
       Origen::OrgFile.open(id, path: OrigenSim.capture_dir) do |org_file|
         @org_file = org_file
         @update_capture = update_capture?
diff --git a/templates/probe.tcl.erb b/templates/probe.tcl.erb
index f311ef6..60a7b27 100644
--- a/templates/probe.tcl.erb
+++ b/templates/probe.tcl.erb
@@ -7,11 +7,11 @@ probe -create -shm <%= options[:testbench_top] || 'origen' %> -depth <%= options
 
 % Hash(options[:force]).each do |net, value|
 %   net = net.to_s.strip.sub(/^(origen\.|origen\.dut\.|\.)/, '')
-force origen.dut.<%= net %> <%= value %>
+force <%= options[:testbench_top] || 'origen' %>.dut.<%= net %> <%= value %>
 % end
 
 % (options[:setup] || '').split("\n").each do |line|
-<%= line.strip.gsub(" dut", " origen.dut") %>
+<%= line.strip.gsub(" dut", " #{options[:testbench_top] || 'origen'}.dut") %>
 % end
 
 run