diff --git a/src/hardware_templates.jl b/src/hardware_templates.jl
index 6600f99..32e787e 100644
--- a/src/hardware_templates.jl
+++ b/src/hardware_templates.jl
@@ -1,12 +1,12 @@
-function default_samplemapper(rig_name::AbstractString, daq_chan_name::String; sample_rate = 10000s^-1)
+function default_samplemapper(rig::AbstractString, daq_chan_name::String; sample_rate = 10000s^-1)
     #is_digi_funcs = [iscam, islas, isstim, iscammonitor]
-    #any(map(f->f(daq_chan_name, rig_name)), is_digi_funcs)
-    if isdigital(daq_chan_name, rig_name)
+    #any(map(f->f(daq_chan_name, rig)), is_digi_funcs)
+    if isdigital(daq_chan_name, rig)
         return ttl_samplemapper(; sample_rate = sample_rate)
-    elseif ispos(daq_chan_name, rig_name) || isposmonitor(daq_chan_name, rig_name)
-        return piezo_samplemapper(PIEZO_RANGES[rig_name]...; sample_rate = sample_rate)
-    elseif isanalog(daq_chan_name, rig_name)
-        if isoutput(daq_chan_name, rig_name)
+    elseif ispos(daq_chan_name, rig) || isposmonitor(daq_chan_name, rig)
+        return piezo_samplemapper(PIEZO_RANGES[rig]...; sample_rate = sample_rate)
+    elseif isanalog(daq_chan_name, rig)
+        if isoutput(daq_chan_name, rig)
             return generic_ao_samplemapper(AO_RANGE[rig]...; sample_rate = sample_rate)
         else
             return generic_ai_samplemapper(AI_RANGE[rig]...; sample_rate = sample_rate)