diff --git a/modules/subchannel/doc/content/source/auxkernels/QPrimeDuctAux.md b/modules/subchannel/doc/content/source/auxkernels/QPrimeDuctAux.md
deleted file mode 100644
index 14f5a9df30d1..000000000000
--- a/modules/subchannel/doc/content/source/auxkernels/QPrimeDuctAux.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# QPrimeDuctAux
-
-!syntax description /AuxKernels/QPrimeDuctAux
-
-## Description
-
-<!-- -->
-
-The `QPrimeDuctAux` AuxKernel is used to compute the axial heat rate on a hexagonal duct surface.
-
-!syntax parameters /AuxKernels/QPrimeDuctAux
-
-!syntax inputs /AuxKernels/QPrimeDuctAux
-
-!syntax children /AuxKernels/QPrimeDuctAux
diff --git a/modules/subchannel/doc/content/source/auxkernels/RZQPrimeAuxPin.md b/modules/subchannel/doc/content/source/auxkernels/SCMRZPinQPrimeAux.md
similarity index 50%
rename from modules/subchannel/doc/content/source/auxkernels/RZQPrimeAuxPin.md
rename to modules/subchannel/doc/content/source/auxkernels/SCMRZPinQPrimeAux.md
index eec3d131a551..b52ed18eb55e 100644
--- a/modules/subchannel/doc/content/source/auxkernels/RZQPrimeAuxPin.md
+++ b/modules/subchannel/doc/content/source/auxkernels/SCMRZPinQPrimeAux.md
@@ -1,12 +1,12 @@
-# RZQPrimeAuxPin
+# SCMRZPinQPrimeAux
 
-!syntax description /AuxKernels/RZQPrimeAuxPin
+!syntax description /AuxKernels/SCMRZPinQPrimeAux
 
 ## Description
 
 <!-- -->
 
-The `RZQPrimeAuxPin` AuxKernel is used to compute the linear heat rate (w/m) on the surface of a fuel pin that is modeled with a 2D-RZ axi-symmetric mesh.
+The `SCMRZPinQPrimeAux` AuxKernel is used to compute the linear heat rate (w/m) on the surface of a fuel pin that is modeled with a 2D-RZ axi-symmetric mesh.
 It's a kernel that inherits from `DiffusionFluxAux` to calculate the flux, but in addition it multiplies with the pin diameter. The user needs to provide the
 diffusion coefficient and the temperature variable.
 
@@ -14,8 +14,8 @@ diffusion coefficient and the temperature variable.
 
 !listing /examples/coupling/1pinSquare_thermomech_SCM/one_pin_problem_sub.i block=AuxKernels language=cpp
 
-!syntax parameters /AuxKernels/RZQPrimeAuxPin
+!syntax parameters /AuxKernels/SCMRZPinQPrimeAux
 
-!syntax inputs /AuxKernels/RZQPrimeAuxPin
+!syntax inputs /AuxKernels/SCMRZPinQPrimeAux
 
-!syntax children /AuxKernels/RZQPrimeAuxPin
+!syntax children /AuxKernels/SCMRZPinQPrimeAux
diff --git a/modules/subchannel/doc/content/source/auxkernels/SCMTriDuctQPrimeAux.md b/modules/subchannel/doc/content/source/auxkernels/SCMTriDuctQPrimeAux.md
new file mode 100644
index 000000000000..665ef590a4c0
--- /dev/null
+++ b/modules/subchannel/doc/content/source/auxkernels/SCMTriDuctQPrimeAux.md
@@ -0,0 +1,15 @@
+# SCMTriDuctQPrimeAux
+
+!syntax description /AuxKernels/SCMTriDuctQPrimeAux
+
+## Description
+
+<!-- -->
+
+The `SCMTriDuctQPrimeAux` AuxKernel is used to compute the axial heat rate on a hexagonal duct surface.
+
+!syntax parameters /AuxKernels/SCMTriDuctQPrimeAux
+
+!syntax inputs /AuxKernels/SCMTriDuctQPrimeAux
+
+!syntax children /AuxKernels/SCMTriDuctQPrimeAux
diff --git a/modules/subchannel/doc/content/source/postprocessors/PinSurfaceTemperature.md b/modules/subchannel/doc/content/source/postprocessors/SCMPinSurfaceTemperature.md
similarity index 59%
rename from modules/subchannel/doc/content/source/postprocessors/PinSurfaceTemperature.md
rename to modules/subchannel/doc/content/source/postprocessors/SCMPinSurfaceTemperature.md
index d5df04669d4c..16227b04b4e9 100644
--- a/modules/subchannel/doc/content/source/postprocessors/PinSurfaceTemperature.md
+++ b/modules/subchannel/doc/content/source/postprocessors/SCMPinSurfaceTemperature.md
@@ -1,6 +1,6 @@
-# PinSurfaceTemperature
+# SCMPinSurfaceTemperature
 
-!syntax description /Postprocessors/PinSurfaceTemperature
+!syntax description /Postprocessors/SCMPinSurfaceTemperature
 
 ## Overview
 
@@ -13,14 +13,14 @@ The assumption is that each neighboring subchannel to a specific pin sees the sa
 Using the `Dittus-Boelter` approach we calculate surface temperatures for each neighbor. The numerical
 average is `Tpin`.
 
-Then, the postprocessor interpolates the value of the variable `Tpin` at a certain pin [!param](/Postprocessors/PinSurfaceTemperature/index) and [!param](/Postprocessors/PinSurfaceTemperature/height).
+Then, the postprocessor interpolates the value of the variable `Tpin` at a certain pin [!param](/Postprocessors/SCMPinSurfaceTemperature/index) and [!param](/Postprocessors/SCMPinSurfaceTemperature/height).
 
 ## Example Input File Syntax
 
 !listing /test/tests/problems/SFR/sodium-19pin/test19_monolithic.i block=Postprocessors language=cpp
 
-!syntax parameters /Postprocessors/PinSurfaceTemperature
+!syntax parameters /Postprocessors/SCMPinSurfaceTemperature
 
-!syntax inputs /Postprocessors/PinSurfaceTemperature
+!syntax inputs /Postprocessors/SCMPinSurfaceTemperature
 
-!syntax children /Postprocessors/PinSurfaceTemperature
+!syntax children /Postprocessors/SCMPinSurfaceTemperature
diff --git a/modules/subchannel/examples/ABR/Pr_SC_main_hc.i b/modules/subchannel/examples/ABR/Pr_SC_main_hc.i
index 5eab47ae5b4b..de3b2fb32bf1 100644
--- a/modules/subchannel/examples/ABR/Pr_SC_main_hc.i
+++ b/modules/subchannel/examples/ABR/Pr_SC_main_hc.i
@@ -11,12 +11,12 @@ outlet_pressure = 2.0e5 # Pa # gauge pressure
 ###################################################
 # units are cm - do not forget to convert to meter
 scale_factor = 0.01
-pin_pitch = ${fparse 0.8909*scale_factor}
-pin_diameter = ${fparse 0.755*scale_factor}
-wire_pitch = ${fparse 20.32*scale_factor}
-wire_diameter = ${fparse 0.1307*scale_factor}
-flat_to_flat = ${fparse 14.922*scale_factor}
-inter_wrapper_width = ${fparse 0.432*scale_factor}
+pin_pitch = '${fparse 0.8909*scale_factor}'
+pin_diameter = '${fparse 0.755*scale_factor}'
+wire_pitch = '${fparse 20.32*scale_factor}'
+wire_diameter = '${fparse 0.1307*scale_factor}'
+flat_to_flat = '${fparse 14.922*scale_factor}'
+inter_wrapper_width = '${fparse 0.432*scale_factor}'
 ###################################################
 #inter_wall_width = ${fparse outer_duct_in - inner_duct_out}
 
@@ -25,29 +25,29 @@ inter_wrapper_width = ${fparse 0.432*scale_factor}
 A12 = 1.00423e3
 A13 = -0.21390
 A14 = -1.1046e-5
-rho = ${fparse A12 + A13 * inlet_temperature + A14 * inlet_temperature * inlet_temperature}
+rho = '${fparse A12 + A13 * inlet_temperature + A14 * inlet_temperature * inlet_temperature}'
 #### Viscosity
 A52 = 3.6522e-5
 A53 = 0.16626
 A54 = -4.56877e1
 A55 = 2.8733e4
-mu = ${fparse A52 + A53 / inlet_temperature + A54 / inlet_temperature / inlet_temperature +
-        A55 / (inlet_temperature * inlet_temperature * inlet_temperature)}
+mu = '${fparse A52 + A53 / inlet_temperature + A54 / inlet_temperature / inlet_temperature +
+        A55 / (inlet_temperature * inlet_temperature * inlet_temperature)}'
 #### Specific heat at constant pressure
 A28 = 7.3898e5
 A29 = 3.154e5
 A30 = 1.1340e3
 A31 = -2.2153e-1
 A32 = 1.1156e-4
-dt = ${fparse 2503.3 - inlet_temperature}
-cp = ${fparse A28 / dt / dt + A29 / dt + A30 + A31 * dt + A32 * dt * dt}
+dt = '${fparse 2503.3 - inlet_temperature}'
+cp = '${fparse A28 / dt / dt + A29 / dt + A30 + A31 * dt + A32 * dt * dt}'
 #### Heat conduction coefficient
 A48 = 1.1045e2
 A49 = -6.5112e-2
 A50 = 1.5430e-5
 A51 = -2.4617e-9
-k = ${fparse A48 + A49 * inlet_temperature + A50 * inlet_temperature * inlet_temperature +
-        A51 * inlet_temperature * inlet_temperature * inlet_temperature}
+k = '${fparse A48 + A49 * inlet_temperature + A50 * inlet_temperature * inlet_temperature +
+        A51 * inlet_temperature * inlet_temperature * inlet_temperature}'
 #### Molar mass
 molar_mass = 22.989769e-3
 
@@ -62,7 +62,7 @@ cp_sodium = 300
 rho_sodium = 7800
 
 # hydraulic diameter
-D_hydraulic_interwrapper = ${fparse 2 * inter_wrapper_width}
+D_hydraulic_interwrapper = '${fparse 2 * inter_wrapper_width}'
 
 wrapper_blocks = 'wall'
 inter_wrapper_blocks = 'inter_wrapper'
@@ -114,9 +114,9 @@ inter_wrapper_blocks = 'inter_wrapper'
     v = duct_surface_temperature
   []
   [outside_bc]
-   type = NeumannBC
-   variable = T_wrapper
-   boundary = '10000 10001 10002'
+    type = NeumannBC
+    variable = T_wrapper
+    boundary = '10000 10001 10002'
   []
 []
 
@@ -142,7 +142,7 @@ inter_wrapper_blocks = 'inter_wrapper'
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = ${k_wrapper}
     flat_to_flat = ${flat_to_flat}
     variable = q_prime_duct
@@ -166,10 +166,10 @@ inter_wrapper_blocks = 'inter_wrapper'
   solve_type = 'PJFNK'
   petsc_options_iname = '-pc_type -pc_factor_mat_solver_package'
   petsc_options_value = 'lu superlu_dist'
-  fixed_point_max_its   = 5
+  fixed_point_max_its = 5
   fixed_point_min_its = 2
-  fixed_point_rel_tol   = 1e-4
-  fixed_point_abs_tol   = 1e-3
+  fixed_point_rel_tol = 1e-4
+  fixed_point_abs_tol = 1e-3
 
   [Quadrature]
     order = THIRD
@@ -213,10 +213,10 @@ inter_wrapper_blocks = 'inter_wrapper'
     variable = q_prime_duct
   []
 
-   [T_duct] # Recover T_duct from SC solve
-     type = MultiAppNearestNodeTransfer
-     from_multi_app = subchannel
-     source_variable = Tduct
-     variable = duct_surface_temperature
-   []
+  [T_duct] # Recover T_duct from SC solve
+    type = MultiAppNearestNodeTransfer
+    from_multi_app = subchannel
+    source_variable = Tduct
+    variable = duct_surface_temperature
+  []
 []
diff --git a/modules/subchannel/examples/ABR/Pr_SC_master_hc.i b/modules/subchannel/examples/ABR/Pr_SC_master_hc.i
index 4bbf6876764a..577980e99751 100644
--- a/modules/subchannel/examples/ABR/Pr_SC_master_hc.i
+++ b/modules/subchannel/examples/ABR/Pr_SC_master_hc.i
@@ -13,12 +13,12 @@ outlet_pressure = 2.0e5 # Pa # gauge pressure
 ###################################################
 # units are cm - do not forget to convert to meter
 scale_factor = 0.01
-pin_pitch = ${fparse 0.8909*scale_factor}
-pin_diameter = ${fparse 0.755*scale_factor}
-wire_pitch = ${fparse 20.32*scale_factor}
-wire_diameter = ${fparse 0.1307*scale_factor}
-flat_to_flat = ${fparse 14.922*scale_factor}
-inter_wrapper_width = ${fparse 0.432*scale_factor}
+pin_pitch = '${fparse 0.8909*scale_factor}'
+pin_diameter = '${fparse 0.755*scale_factor}'
+wire_pitch = '${fparse 20.32*scale_factor}'
+wire_diameter = '${fparse 0.1307*scale_factor}'
+flat_to_flat = '${fparse 14.922*scale_factor}'
+inter_wrapper_width = '${fparse 0.432*scale_factor}'
 ###################################################
 #inter_wall_width = ${fparse outer_duct_in - inner_duct_out}
 
@@ -27,29 +27,29 @@ inter_wrapper_width = ${fparse 0.432*scale_factor}
 A12 = 1.00423e3
 A13 = -0.21390
 A14 = -1.1046e-5
-rho = ${fparse A12 + A13 * inlet_temperature + A14 * inlet_temperature * inlet_temperature}
+rho = '${fparse A12 + A13 * inlet_temperature + A14 * inlet_temperature * inlet_temperature}'
 #### Viscosity
 A52 = 3.6522e-5
 A53 = 0.16626
 A54 = -4.56877e1
 A55 = 2.8733e4
-mu = ${fparse A52 + A53 / inlet_temperature + A54 / inlet_temperature / inlet_temperature +
-        A55 / (inlet_temperature * inlet_temperature * inlet_temperature)}
+mu = '${fparse A52 + A53 / inlet_temperature + A54 / inlet_temperature / inlet_temperature +
+        A55 / (inlet_temperature * inlet_temperature * inlet_temperature)}'
 #### Specific heat at constant pressure
 A28 = 7.3898e5
 A29 = 3.154e5
 A30 = 1.1340e3
 A31 = -2.2153e-1
 A32 = 1.1156e-4
-dt = ${fparse 2503.3 - inlet_temperature}
-cp = ${fparse A28 / dt / dt + A29 / dt + A30 + A31 * dt + A32 * dt * dt}
+dt = '${fparse 2503.3 - inlet_temperature}'
+cp = '${fparse A28 / dt / dt + A29 / dt + A30 + A31 * dt + A32 * dt * dt}'
 #### Heat conduction coefficient
 A48 = 1.1045e2
 A49 = -6.5112e-2
 A50 = 1.5430e-5
 A51 = -2.4617e-9
-k = ${fparse A48 + A49 * inlet_temperature + A50 * inlet_temperature * inlet_temperature +
-        A51 * inlet_temperature * inlet_temperature * inlet_temperature}
+k = '${fparse A48 + A49 * inlet_temperature + A50 * inlet_temperature * inlet_temperature +
+        A51 * inlet_temperature * inlet_temperature * inlet_temperature}'
 #### Molar mass
 molar_mass = 22.989769e-3
 
@@ -64,7 +64,7 @@ cp_sodium = 300
 rho_sodium = 7800
 
 # hydraulic diameter
-D_hydraulic_interwrapper = ${fparse 2 * inter_wrapper_width}
+D_hydraulic_interwrapper = '${fparse 2 * inter_wrapper_width}'
 
 wrapper_blocks = 'wall'
 inter_wrapper_blocks = 'inter_wrapper'
@@ -116,9 +116,9 @@ inter_wrapper_blocks = 'inter_wrapper'
     v = duct_surface_temperature
   []
   [outside_bc]
-   type = NeumannBC
-   variable = T_wrapper
-   boundary = '10000 10001 10002'
+    type = NeumannBC
+    variable = T_wrapper
+    boundary = '10000 10001 10002'
   []
 []
 
@@ -144,7 +144,7 @@ inter_wrapper_blocks = 'inter_wrapper'
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = ${k_wrapper}
     flat_to_flat = ${flat_to_flat}
     variable = q_prime_duct
@@ -168,10 +168,10 @@ inter_wrapper_blocks = 'inter_wrapper'
   solve_type = 'PJFNK'
   petsc_options_iname = '-pc_type -pc_factor_mat_solver_package'
   petsc_options_value = 'lu superlu_dist'
-  fixed_point_max_its   = 5
+  fixed_point_max_its = 5
   fixed_point_min_its = 2
-  fixed_point_rel_tol   = 1e-4
-  fixed_point_abs_tol   = 1e-3
+  fixed_point_rel_tol = 1e-4
+  fixed_point_abs_tol = 1e-3
 
   [Quadrature]
     order = THIRD
@@ -215,10 +215,10 @@ inter_wrapper_blocks = 'inter_wrapper'
     variable = q_prime_duct
   []
 
-   [T_duct] # Recover T_duct from SC solve
-     type = MultiAppNearestNodeTransfer
-     from_multi_app = subchannel
-     source_variable = Tduct
-     variable = duct_surface_temperature
-   []
+  [T_duct] # Recover T_duct from SC solve
+    type = MultiAppNearestNodeTransfer
+    from_multi_app = subchannel
+    source_variable = Tduct
+    variable = duct_surface_temperature
+  []
 []
diff --git a/modules/subchannel/examples/ABTR/ABTR_core/pin.i b/modules/subchannel/examples/ABTR/ABTR_core/pin.i
index 908d1a1bddc0..4416cb8af639 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core/pin.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core/pin.i
@@ -1,15 +1,15 @@
 T_in = 630 # K
 reactor_power = 250e6 #WTh
-fuel_assemblies_per_power_unit = ${fparse 2}
+fuel_assemblies_per_power_unit = '${fparse 2}'
 fuel_pins_per_assembly = 217
-pin_power = ${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)} # Approx.
+pin_power = '${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)}' # Approx.
 
 scale_factor = 0.01
-fuel_pin_diameter= ${fparse 0.8*scale_factor}
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
+fuel_pin_diameter = '${fparse 0.8*scale_factor}'
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
 
 [Mesh]
   second_order = true
@@ -27,7 +27,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     pin_type = 1
     pitch = 0.012
     num_sectors = 4
-    region_ids='1 2 3 4'
+    region_ids = '1 2 3 4'
     ring_radii = '${fparse fuel_pin_diameter/2}
                   ${fparse fuel_pin_diameter/2 + 1e-5}
                   ${fparse fuel_pin_diameter/2 + 2e-5}'
@@ -72,7 +72,6 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     old_block = '1'
     new_block = 'fuel_pin'
   []
-
 []
 
 [Functions]
@@ -103,7 +102,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime_pin
     diffusion_variable = temperature
diff --git a/modules/subchannel/examples/ABTR/ABTR_core/wrapper.i b/modules/subchannel/examples/ABTR/ABTR_core/wrapper.i
index 8c8f46717030..ab7970b018b1 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core/wrapper.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core/wrapper.i
@@ -1,19 +1,19 @@
 # a wrapper mesh for coupling to subchannel
 
 # sqrt(3) / 2 is by how much flat to flat is smaller than corer to corner
-f = ${fparse sqrt(3) / 2}
+f = '${fparse sqrt(3) / 2}'
 
 # units are meters
 scale_factor = 0.01
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
-fuel_element_pitch = ${fparse 14.598*scale_factor}
-inter_assembly_gap = ${fparse 0.4*scale_factor}
-wrapper_thickness = ${fparse 0.3*scale_factor}
-duct_outside = ${fparse fuel_element_pitch - inter_assembly_gap}
-duct_inside = ${fparse duct_outside - 2 * wrapper_thickness}
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
+fuel_element_pitch = '${fparse 14.598*scale_factor}'
+inter_assembly_gap = '${fparse 0.4*scale_factor}'
+wrapper_thickness = '${fparse 0.3*scale_factor}'
+duct_outside = '${fparse fuel_element_pitch - inter_assembly_gap}'
+duct_inside = '${fparse duct_outside - 2 * wrapper_thickness}'
 
 # number of radial elements in the wrapper
 n_radial = 4
@@ -35,7 +35,7 @@ T_in = 630
     background_intervals = 1
     background_block_ids = '1'
     # note that polygon_size is "like radius"
-    polygon_size = ${fparse duct_outside / 2}
+    polygon_size = '${fparse duct_outside / 2}'
     duct_sizes = '${fparse duct_inside / 2 / f}'
     duct_intervals = '${n_radial}'
     duct_block_ids = '2'
@@ -147,9 +147,9 @@ T_in = 630
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = 'thermal_conductivity'
-    flat_to_flat = ${fparse duct_inside}
+    flat_to_flat = '${fparse duct_inside}'
     variable = q_prime_d
     diffusion_variable = temperature
     component = normal
diff --git a/modules/subchannel/examples/ABTR/ABTR_core_low_flow/pin.i b/modules/subchannel/examples/ABTR/ABTR_core_low_flow/pin.i
index 619fb2997c21..81d30837adfe 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core_low_flow/pin.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core_low_flow/pin.i
@@ -1,15 +1,15 @@
 T_in = 630 # K
 reactor_power = 250e6 #WTh
-fuel_assemblies_per_power_unit = ${fparse 4}
+fuel_assemblies_per_power_unit = '${fparse 4}'
 fuel_pins_per_assembly = 217
-pin_power = ${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)} # Approx.
+pin_power = '${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)}' # Approx.
 
 scale_factor = 0.01
-fuel_pin_diameter= ${fparse 0.8*scale_factor}
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
+fuel_pin_diameter = '${fparse 0.8*scale_factor}'
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
 
 [Mesh]
   second_order = true
@@ -27,7 +27,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     pin_type = 1
     pitch = 0.012
     num_sectors = 4
-    region_ids='1 2 3 4'
+    region_ids = '1 2 3 4'
     ring_radii = '${fparse fuel_pin_diameter/2}
                   ${fparse fuel_pin_diameter/2 + 1e-5}
                   ${fparse fuel_pin_diameter/2 + 2e-5}'
@@ -72,7 +72,6 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     old_block = '1'
     new_block = 'fuel_pin'
   []
-
 []
 
 [Functions]
@@ -103,7 +102,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime_pin
     diffusion_variable = temperature
diff --git a/modules/subchannel/examples/ABTR/ABTR_core_low_flow/wrapper.i b/modules/subchannel/examples/ABTR/ABTR_core_low_flow/wrapper.i
index 8b4f894ceef7..e2b8cf29b467 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core_low_flow/wrapper.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core_low_flow/wrapper.i
@@ -1,19 +1,19 @@
 # a wrapper mesh for coupling to subchannel
 
 # sqrt(3) / 2 is by how much flat to flat is smaller than corer to corner
-f = ${fparse sqrt(3) / 2}
+f = '${fparse sqrt(3) / 2}'
 
 # units are meters
 scale_factor = 0.01
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
-fuel_element_pitch = ${fparse 14.598*scale_factor}
-inter_assembly_gap = ${fparse 0.4*scale_factor}
-wrapper_thickness = ${fparse 0.3*scale_factor}
-duct_outside = ${fparse fuel_element_pitch - inter_assembly_gap}
-duct_inside = ${fparse duct_outside - 2 * wrapper_thickness}
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
+fuel_element_pitch = '${fparse 14.598*scale_factor}'
+inter_assembly_gap = '${fparse 0.4*scale_factor}'
+wrapper_thickness = '${fparse 0.3*scale_factor}'
+duct_outside = '${fparse fuel_element_pitch - inter_assembly_gap}'
+duct_inside = '${fparse duct_outside - 2 * wrapper_thickness}'
 
 # number of radial elements in the wrapper
 n_radial = 4
@@ -35,7 +35,7 @@ T_in = 630
     background_intervals = 1
     background_block_ids = '1'
     # note that polygon_size is "like radius"
-    polygon_size = ${fparse duct_outside / 2}
+    polygon_size = '${fparse duct_outside / 2}'
     duct_sizes = '${fparse duct_inside / 2 / f}'
     duct_intervals = '${n_radial}'
     duct_block_ids = '2'
@@ -141,9 +141,9 @@ T_in = 630
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = 'thermal_conductivity'
-    flat_to_flat = ${fparse duct_inside}
+    flat_to_flat = '${fparse duct_inside}'
     variable = q_prime_d
     diffusion_variable = temperature
     component = normal
diff --git a/modules/subchannel/examples/ABTR/ABTR_core_transient/hot_pin.i b/modules/subchannel/examples/ABTR/ABTR_core_transient/hot_pin.i
index 32d926045893..63c87fcc457d 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core_transient/hot_pin.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core_transient/hot_pin.i
@@ -1,15 +1,15 @@
 T_in = 630 # K
 reactor_power = 250e6 #WTh
-fuel_assemblies_per_power_unit = ${fparse 4}
+fuel_assemblies_per_power_unit = '${fparse 4}'
 fuel_pins_per_assembly = 217
-pin_power = ${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)} # Approx.
+pin_power = '${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)}' # Approx.
 
 scale_factor = 0.01
-fuel_pin_diameter= ${fparse 0.8*scale_factor}
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
+fuel_pin_diameter = '${fparse 0.8*scale_factor}'
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
 
 [Mesh]
   second_order = true
@@ -27,7 +27,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     pin_type = 1
     pitch = 0.012
     num_sectors = 4
-    region_ids='1 2 3 4'
+    region_ids = '1 2 3 4'
     ring_radii = '${fparse fuel_pin_diameter/2}
                   ${fparse fuel_pin_diameter/2 + 1e-5}
                   ${fparse fuel_pin_diameter/2 + 2e-5}'
@@ -72,7 +72,6 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     old_block = '1'
     new_block = 'fuel_pin'
   []
-
 []
 
 [Functions]
@@ -102,7 +101,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime_pin
     diffusion_variable = temperature
diff --git a/modules/subchannel/examples/ABTR/ABTR_core_transient/pin.i b/modules/subchannel/examples/ABTR/ABTR_core_transient/pin.i
index 450448ac7f73..d319f514a10e 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core_transient/pin.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core_transient/pin.i
@@ -1,15 +1,15 @@
 T_in = 630 # K
 reactor_power = 250e6 #WTh
-fuel_assemblies_per_power_unit = ${fparse 4}
+fuel_assemblies_per_power_unit = '${fparse 4}'
 fuel_pins_per_assembly = 217
-pin_power = ${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)} # Approx.
+pin_power = '${fparse reactor_power/(fuel_assemblies_per_power_unit*fuel_pins_per_assembly)}' # Approx.
 
 scale_factor = 0.01
-fuel_pin_diameter= ${fparse 0.8*scale_factor}
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
+fuel_pin_diameter = '${fparse 0.8*scale_factor}'
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
 
 [Mesh]
   second_order = true
@@ -27,7 +27,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     pin_type = 1
     pitch = 0.012
     num_sectors = 4
-    region_ids='1 2 3 4'
+    region_ids = '1 2 3 4'
     ring_radii = '${fparse fuel_pin_diameter/2}
                   ${fparse fuel_pin_diameter/2 + 1e-5}
                   ${fparse fuel_pin_diameter/2 + 2e-5}'
@@ -72,7 +72,6 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
     old_block = '1'
     new_block = 'fuel_pin'
   []
-
 []
 
 [Functions]
@@ -106,7 +105,7 @@ height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime_pin
     diffusion_variable = temperature
diff --git a/modules/subchannel/examples/ABTR/ABTR_core_transient/wrapper.i b/modules/subchannel/examples/ABTR/ABTR_core_transient/wrapper.i
index ac54df8c1e04..35a82a1137ef 100644
--- a/modules/subchannel/examples/ABTR/ABTR_core_transient/wrapper.i
+++ b/modules/subchannel/examples/ABTR/ABTR_core_transient/wrapper.i
@@ -1,19 +1,19 @@
 # a wrapper mesh for coupling to subchannel
 
 # sqrt(3) / 2 is by how much flat to flat is smaller than corer to corner
-f = ${fparse sqrt(3) / 2}
+f = '${fparse sqrt(3) / 2}'
 
 # units are meters
 scale_factor = 0.01
-length_entry_fuel = ${fparse 60*scale_factor}
-length_heated_fuel = ${fparse 80*scale_factor}
-length_outlet_fuel = ${fparse 120*scale_factor}
-height = ${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}
-fuel_element_pitch = ${fparse 14.598*scale_factor}
-inter_assembly_gap = ${fparse 0.4*scale_factor}
-wrapper_thickness = ${fparse 0.3*scale_factor}
-duct_outside = ${fparse fuel_element_pitch - inter_assembly_gap}
-duct_inside = ${fparse duct_outside - 2 * wrapper_thickness}
+length_entry_fuel = '${fparse 60*scale_factor}'
+length_heated_fuel = '${fparse 80*scale_factor}'
+length_outlet_fuel = '${fparse 120*scale_factor}'
+height = '${fparse length_entry_fuel+length_heated_fuel+length_outlet_fuel}'
+fuel_element_pitch = '${fparse 14.598*scale_factor}'
+inter_assembly_gap = '${fparse 0.4*scale_factor}'
+wrapper_thickness = '${fparse 0.3*scale_factor}'
+duct_outside = '${fparse fuel_element_pitch - inter_assembly_gap}'
+duct_inside = '${fparse duct_outside - 2 * wrapper_thickness}'
 
 # number of radial elements in the wrapper
 n_radial = 4
@@ -35,7 +35,7 @@ T_in = 630
     background_intervals = 1
     background_block_ids = '1'
     # note that polygon_size is "like radius"
-    polygon_size = ${fparse duct_outside / 2}
+    polygon_size = '${fparse duct_outside / 2}'
     duct_sizes = '${fparse duct_inside / 2 / f}'
     duct_intervals = '${n_radial}'
     duct_block_ids = '2'
@@ -145,9 +145,9 @@ T_in = 630
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = 'thermal_conductivity'
-    flat_to_flat = ${fparse duct_inside}
+    flat_to_flat = '${fparse duct_inside}'
     variable = q_prime_d
     diffusion_variable = temperature
     component = normal
diff --git a/modules/subchannel/examples/EBR-II/Pr_SC_ss.i b/modules/subchannel/examples/EBR-II/Pr_SC_ss.i
index c391aa07d236..84d65fdbdd94 100644
--- a/modules/subchannel/examples/EBR-II/Pr_SC_ss.i
+++ b/modules/subchannel/examples/EBR-II/Pr_SC_ss.i
@@ -13,49 +13,49 @@ outlet_pressure = 2.0e5 # Pa # gauge pressure
 ###################################################
 # units are cm - do not forget to convert to meter
 scale_factor = 0.01
-pin_pitch = ${fparse 0.5664*scale_factor}
-pin_diameter = ${fparse 0.4419*scale_factor}
-wire_pitch = ${fparse 15.24*scale_factor}
-wire_diameter = ${fparse 0.1244*scale_factor}
-flat_to_flat = ${fparse 4.64*scale_factor}
+pin_pitch = '${fparse 0.5664*scale_factor}'
+pin_diameter = '${fparse 0.4419*scale_factor}'
+wire_pitch = '${fparse 15.24*scale_factor}'
+wire_diameter = '${fparse 0.1244*scale_factor}'
+flat_to_flat = '${fparse 4.64*scale_factor}'
 # n_rings = 5
-heated_length = ${fparse 34.3*scale_factor}
-unheated_length_exit = ${fparse 26.9*scale_factor}
-length = ${fparse heated_length + unheated_length_exit}
-inter_wrapper_width = ${fparse 0.3*scale_factor}
-outer_duct_in = ${fparse 5.5854*scale_factor}
-inner_duct_out =  ${fparse 4.8437*scale_factor}
+heated_length = '${fparse 34.3*scale_factor}'
+unheated_length_exit = '${fparse 26.9*scale_factor}'
+length = '${fparse heated_length + unheated_length_exit}'
+inter_wrapper_width = '${fparse 0.3*scale_factor}'
+outer_duct_in = '${fparse 5.5854*scale_factor}'
+inner_duct_out = '${fparse 4.8437*scale_factor}'
 ###################################################
-inter_wall_width = ${fparse outer_duct_in - inner_duct_out}
+inter_wall_width = '${fparse outer_duct_in - inner_duct_out}'
 
 # fluid properties
 ####  Density #####
 A12 = 1.00423e3
 A13 = -0.21390
 A14 = -1.1046e-5
-rho = ${fparse A12 + A13 * inlet_temperature + A14 * inlet_temperature * inlet_temperature}
+rho = '${fparse A12 + A13 * inlet_temperature + A14 * inlet_temperature * inlet_temperature}'
 #### Viscosity
 A52 = 3.6522e-5
 A53 = 0.16626
 A54 = -4.56877e1
 A55 = 2.8733e4
-mu = ${fparse A52 + A53 / inlet_temperature + A54 / inlet_temperature / inlet_temperature +
-        A55 / (inlet_temperature * inlet_temperature * inlet_temperature)}
+mu = '${fparse A52 + A53 / inlet_temperature + A54 / inlet_temperature / inlet_temperature +
+        A55 / (inlet_temperature * inlet_temperature * inlet_temperature)}'
 #### Specific heat at constant pressure
 A28 = 7.3898e5
 A29 = 3.154e5
 A30 = 1.1340e3
 A31 = -2.2153e-1
 A32 = 1.1156e-4
-dt = ${fparse 2503.3 - inlet_temperature}
-cp = ${fparse A28 / dt / dt + A29 / dt + A30 + A31 * dt + A32 * dt * dt}
+dt = '${fparse 2503.3 - inlet_temperature}'
+cp = '${fparse A28 / dt / dt + A29 / dt + A30 + A31 * dt + A32 * dt * dt}'
 #### Heat conduction coefficient
 A48 = 1.1045e2
 A49 = -6.5112e-2
 A50 = 1.5430e-5
 A51 = -2.4617e-9
-k = ${fparse A48 + A49 * inlet_temperature + A50 * inlet_temperature * inlet_temperature +
-        A51 * inlet_temperature * inlet_temperature * inlet_temperature}
+k = '${fparse A48 + A49 * inlet_temperature + A50 * inlet_temperature * inlet_temperature +
+        A51 * inlet_temperature * inlet_temperature * inlet_temperature}'
 #### Molar mass
 molar_mass = 22.989769e-3
 
@@ -65,8 +65,8 @@ cp_wrapper = 300
 rho_wrapper = 7800
 
 # hydraulic diameters
-D_hydraulic_interwrapper = ${fparse 2 * inter_wrapper_width}
-D_hydraulic_interwall = ${fparse 2 * inter_wall_width}
+D_hydraulic_interwrapper = '${fparse 2 * inter_wrapper_width}'
+D_hydraulic_interwall = '${fparse 2 * inter_wall_width}'
 D_hydraulic_fuel = 0.00297 # Why?
 
 wrapper_blocks = 'wall'
@@ -299,7 +299,7 @@ ramp_time = 1.0
     initial_pressure = '${outlet_pressure}'
 
     # boundary conditions
-    inlet_boundaries =     'inlet_interwrapper
+    inlet_boundaries = 'inlet_interwrapper
                             inlet_interwall
                             inlet_central_assembly
                             inlet_porous_flow_hfd
@@ -319,7 +319,7 @@ ramp_time = 1.0
                             flux-mass
                             flux-mass'
 
-    flux_inlet_pps  = 'interwrapper_mfr
+    flux_inlet_pps = 'interwrapper_mfr
                        interwall_mfr
                        XX09_mfr
                        HFD_mfr
@@ -413,7 +413,7 @@ ramp_time = 1.0
   ## set characteristic length on each block
   [characteristic_length]
     type = PiecewiseByBlockFunctorMaterial
-    prop_name =  'characteristic_length'
+    prop_name = 'characteristic_length'
     subdomain_to_prop_value = 'inter_wrapper ${D_hydraulic_interwrapper}
                                interwall     ${D_hydraulic_interwall}
                                porous_flow_hfd  ${D_hydraulic_fuel}
@@ -461,7 +461,7 @@ ramp_time = 1.0
 
   [heat_source]
     type = PiecewiseByBlockFunctorMaterial
-    prop_name =  'heat_source'
+    prop_name = 'heat_source'
     subdomain_to_prop_value = 'inter_wrapper 0.0
                                interwall     0.0
                                porous_flow_hfd  HFD_power
@@ -521,7 +521,7 @@ ramp_time = 1.0
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = ${k_wrapper}
     flat_to_flat = ${flat_to_flat}
     variable = q_prime_duct
@@ -745,7 +745,7 @@ ramp_time = 1.0
   end_time = 10.0
   l_max_its = 20
   [TimeStepper]
-   type = IterationAdaptiveDT
+    type = IterationAdaptiveDT
     dt = 0.2
     iteration_window = 2
     optimal_iterations = 10
diff --git a/modules/subchannel/examples/coupling/1pinHex_thermomech_SCM/one_pin_problem_sub.i b/modules/subchannel/examples/coupling/1pinHex_thermomech_SCM/one_pin_problem_sub.i
index eba9b4da39c1..d10e93268095 100644
--- a/modules/subchannel/examples/coupling/1pinHex_thermomech_SCM/one_pin_problem_sub.i
+++ b/modules/subchannel/examples/coupling/1pinHex_thermomech_SCM/one_pin_problem_sub.i
@@ -10,7 +10,7 @@ T_in = 588.5
   [bisonMesh]
     type = GeneratedMeshGenerator
     dim = 2
-    xmax = ${fparse pin_diameter / 2.0}
+    xmax = '${fparse pin_diameter / 2.0}'
     bias_x = 1.0
     nx = 20
     ymax = ${heated_length}
@@ -50,22 +50,28 @@ T_in = 588.5
   []
 []
 
-[Modules/TensorMechanics/Master]
-  add_variables = true
-  strain = SMALL
-  incremental = true
-  generate_output = 'stress_xx stress_yy stress_xy'
-  temperature = temperature
+[Modules]
 
-  [block0]
-    eigenstrain_names = eigenstrain
-    block = 0
+  [TensorMechanics]
+
+    [Master]
+      add_variables = true
+      strain = SMALL
+      incremental = true
+      generate_output = 'stress_xx stress_yy stress_xy'
+      temperature = temperature
+
+      [block0]
+        eigenstrain_names = eigenstrain
+        block = 0
+      []
+    []
   []
 []
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
diff --git a/modules/subchannel/examples/coupling/1pinSquare_thermomech_SCM/one_pin_problem_sub.i b/modules/subchannel/examples/coupling/1pinSquare_thermomech_SCM/one_pin_problem_sub.i
index 06e1951184e0..d9e2f1f5353c 100644
--- a/modules/subchannel/examples/coupling/1pinSquare_thermomech_SCM/one_pin_problem_sub.i
+++ b/modules/subchannel/examples/coupling/1pinSquare_thermomech_SCM/one_pin_problem_sub.i
@@ -10,7 +10,7 @@ T_in = 359.15
   [bisonMesh]
     type = GeneratedMeshGenerator
     dim = 2
-    xmax = ${fparse pin_diameter / 2.0}
+    xmax = '${fparse pin_diameter / 2.0}'
     bias_x = 1.0
     nx = 20
     ymax = ${heated_length}
@@ -51,22 +51,28 @@ T_in = 359.15
   []
 []
 
-[Modules/TensorMechanics/Master]
-  add_variables = true
-  strain = SMALL
-  incremental = true
-  generate_output = 'stress_xx stress_yy stress_xy'
-  temperature = temperature
+[Modules]
 
-  [block0]
-    eigenstrain_names = eigenstrain
-    block = 0
+  [TensorMechanics]
+
+    [Master]
+      add_variables = true
+      strain = SMALL
+      incremental = true
+      generate_output = 'stress_xx stress_yy stress_xy'
+      temperature = temperature
+
+      [block0]
+        eigenstrain_names = eigenstrain
+        block = 0
+      []
+    []
   []
 []
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
@@ -98,7 +104,7 @@ T_in = 359.15
   []
 []
 
- [Materials]
+[Materials]
   [elasticity_tensor]
     type = ComputeIsotropicElasticityTensor
     block = 0
diff --git a/modules/subchannel/examples/coupling/BISON_SCM/sub_cold_corner.i b/modules/subchannel/examples/coupling/BISON_SCM/sub_cold_corner.i
index 43f230ec049e..bed2fe1773df 100644
--- a/modules/subchannel/examples/coupling/BISON_SCM/sub_cold_corner.i
+++ b/modules/subchannel/examples/coupling/BISON_SCM/sub_cold_corner.i
@@ -6,14 +6,14 @@ clad_bot_gap_height = 0.00127
 clad_gap_width = 0.00009
 clad_thickness = 0.00057
 top_bot_clad_height = 0.00224
-pellet_outer_radius = ${fparse pin_diameter/2.0 - clad_gap_width - clad_thickness}
-pellet_height = ${fparse heated_length -  clad_top_gap_height - clad_bot_gap_height - 2.0 * top_bot_clad_height}
+pellet_outer_radius = '${fparse pin_diameter/2.0 - clad_gap_width - clad_thickness}'
+pellet_height = '${fparse heated_length -  clad_top_gap_height - clad_bot_gap_height - 2.0 * top_bot_clad_height}'
 full_pin_power = 66600 #W
 pin_factor = 0.7
-pin_power = ${fparse full_pin_power * pin_factor}
+pin_power = '${fparse full_pin_power * pin_factor}'
 T_in = 560.15
-y_location = ${fparse 1.5 * pitch}
-DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
+y_location = '${fparse 1.5 * pitch}'
+DY = '${fparse y_location + clad_bot_gap_height + top_bot_clad_height}'
 
 [Mesh]
   second_order = true
@@ -24,13 +24,13 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
     top_bot_clad_height = ${top_bot_clad_height}
     clad_gap_width = ${clad_gap_width}
     clad_thickness = ${clad_thickness}
-    ny_c =  98
-    ny_p =  98
+    ny_c = 98
+    ny_p = 98
     nx_c = 4
     nx_p = 12
-    pellet_height = ${fparse pellet_height}
+    pellet_height = '${fparse pellet_height}'
     pellet_quantity = 1
-    pellet_outer_radius =${pellet_outer_radius}
+    pellet_outer_radius = ${pellet_outer_radius}
     pellet_mesh_density = customize
     clad_mesh_density = customize
   []
@@ -70,7 +70,7 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
@@ -107,7 +107,7 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
 []
 
 [Materials]
-  [fuel_thermal]  # temperature and burnup dependent thermal properties of UO2 (BISON kernel)
+  [fuel_thermal] # temperature and burnup dependent thermal properties of UO2 (BISON kernel)
     type = UO2Thermal
     block = pellet
     thermal_conductivity_model = NFIR
diff --git a/modules/subchannel/examples/coupling/BISON_SCM/sub_hot_corner.i b/modules/subchannel/examples/coupling/BISON_SCM/sub_hot_corner.i
index a84bc6ec8cd4..11fb077ae116 100644
--- a/modules/subchannel/examples/coupling/BISON_SCM/sub_hot_corner.i
+++ b/modules/subchannel/examples/coupling/BISON_SCM/sub_hot_corner.i
@@ -6,14 +6,14 @@ clad_bot_gap_height = 0.00127
 clad_gap_width = 0.00009
 clad_thickness = 0.00057
 top_bot_clad_height = 0.00224
-pellet_outer_radius = ${fparse pin_diameter/2.0 - clad_gap_width - clad_thickness}
-pellet_height = ${fparse heated_length -  clad_top_gap_height - clad_bot_gap_height - 2.0 * top_bot_clad_height}
+pellet_outer_radius = '${fparse pin_diameter/2.0 - clad_gap_width - clad_thickness}'
+pellet_height = '${fparse heated_length -  clad_top_gap_height - clad_bot_gap_height - 2.0 * top_bot_clad_height}'
 full_pin_power = 66600 #W
 pin_factor = 1.3
-pin_power = ${fparse full_pin_power * pin_factor}
+pin_power = '${fparse full_pin_power * pin_factor}'
 T_in = 560.15
-y_location = ${fparse -1.5 * pitch}
-DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
+y_location = '${fparse -1.5 * pitch}'
+DY = '${fparse y_location + clad_bot_gap_height + top_bot_clad_height}'
 
 [Mesh]
   second_order = true
@@ -24,13 +24,13 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
     top_bot_clad_height = ${top_bot_clad_height}
     clad_gap_width = ${clad_gap_width}
     clad_thickness = ${clad_thickness}
-    ny_c =  98
-    ny_p =  98
+    ny_c = 98
+    ny_p = 98
     nx_c = 4
     nx_p = 12
-    pellet_height = ${fparse pellet_height}
+    pellet_height = '${fparse pellet_height}'
     pellet_quantity = 1
-    pellet_outer_radius =${pellet_outer_radius}
+    pellet_outer_radius = ${pellet_outer_radius}
     pellet_mesh_density = customize
     clad_mesh_density = customize
   []
@@ -70,7 +70,7 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
@@ -107,7 +107,7 @@ DY = ${fparse y_location + clad_bot_gap_height + top_bot_clad_height}
 []
 
 [Materials]
-  [fuel_thermal]  # temperature and burnup dependent thermal properties of UO2 (BISON kernel)
+  [fuel_thermal] # temperature and burnup dependent thermal properties of UO2 (BISON kernel)
     type = UO2Thermal
     block = pellet
     thermal_conductivity_model = NFIR
diff --git a/modules/subchannel/examples/coupling/HeatConduction_SCM/sub.i b/modules/subchannel/examples/coupling/HeatConduction_SCM/sub.i
index ab76395e0d86..48af3a8c5774 100644
--- a/modules/subchannel/examples/coupling/HeatConduction_SCM/sub.i
+++ b/modules/subchannel/examples/coupling/HeatConduction_SCM/sub.i
@@ -47,7 +47,7 @@ T_in = 297.039 # K
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
@@ -127,5 +127,5 @@ T_in = 297.039 # K
 []
 
 [Debug]
-  show_execution_order=timestep_end
+  show_execution_order = timestep_end
 []
diff --git a/modules/subchannel/examples/duct/wrapper.i b/modules/subchannel/examples/duct/wrapper.i
index 73f40c3858d6..491816a424e3 100644
--- a/modules/subchannel/examples/duct/wrapper.i
+++ b/modules/subchannel/examples/duct/wrapper.i
@@ -1,13 +1,13 @@
 # a wrapper mesh for coupling to subchannel
 
 # sqrt(3) / 2 is by how much flat to flat is smaller than corer to corner
-f = ${fparse sqrt(3) / 2}
+f = '${fparse sqrt(3) / 2}'
 
 # units are meters
 height = 1.0
 duct_inside = 0.085
 wrapper_thickness = 0.002
-duct_outside = ${fparse duct_inside + 2 * wrapper_thickness}
+duct_outside = '${fparse duct_inside + 2 * wrapper_thickness}'
 
 # number of radial elements in the wrapper
 n_radial = 4
@@ -36,7 +36,7 @@ T_in = 660
     background_intervals = 1
     background_block_ids = '1'
     # note that polygon_size is "like radius"
-    polygon_size = ${fparse duct_outside / 2}
+    polygon_size = '${fparse duct_outside / 2}'
     duct_sizes = '${fparse duct_inside / 2 / f}'
     duct_intervals = '${n_radial}'
     duct_block_ids = '2'
@@ -116,16 +116,22 @@ T_in = 660
   []
 []
 
-[Modules/TensorMechanics/Master]
-  add_variables = true
-  strain = SMALL
-  incremental = true
-  generate_output = 'stress_xx stress_yy stress_xy'
-  temperature = temperature
+[Modules]
 
-  [block0]
-    eigenstrain_names = eigenstrain
-    block = wrapper
+  [TensorMechanics]
+
+    [Master]
+      add_variables = true
+      strain = SMALL
+      incremental = true
+      generate_output = 'stress_xx stress_yy stress_xy'
+      temperature = temperature
+
+      [block0]
+        eigenstrain_names = eigenstrain
+        block = wrapper
+      []
+    []
   []
 []
 
@@ -154,9 +160,9 @@ T_in = 660
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = 'thermal_conductivity'
-    flat_to_flat = ${fparse duct_inside}
+    flat_to_flat = '${fparse duct_inside}'
     variable = q_prime
     diffusion_variable = temperature
     component = normal
@@ -175,13 +181,13 @@ T_in = 660
 [Materials]
   [elasticity_tensor]
     type = ComputeIsotropicElasticityTensor
-    block =  wrapper
+    block = wrapper
     bulk_modulus = 0.333333333333e6
     poissons_ratio = 0.0
   []
   [thermal_strain]
     type = ComputeThermalExpansionEigenstrain
-    block =  wrapper
+    block = wrapper
     temperature = temperature
     stress_free_temperature = ${T_in}
     thermal_expansion_coeff = 1e-5
@@ -194,11 +200,11 @@ T_in = 660
   [heat_conductor]
     type = HeatConductionMaterial
     thermal_conductivity = 1.0
-    block =  wrapper
+    block = wrapper
   []
   [density]
     type = Density
-    block =  wrapper
+    block = wrapper
     density = 1.0
   []
 []
@@ -219,7 +225,7 @@ T_in = 660
     type = DirichletBC
     variable = temperature
     boundary = 'outside'
-    value = ${fparse T_in+10}
+    value = '${fparse T_in+10}'
   []
 
   [no_x]
diff --git a/modules/subchannel/examples/full-sodium-assembly/pin.i b/modules/subchannel/examples/full-sodium-assembly/pin.i
index 816840ff26ad..71322cbc61ea 100644
--- a/modules/subchannel/examples/full-sodium-assembly/pin.i
+++ b/modules/subchannel/examples/full-sodium-assembly/pin.i
@@ -19,7 +19,7 @@ height = 1.0
     pin_type = 1
     pitch = 0.012
     num_sectors = 4
-    region_ids='1 2 3 4'
+    region_ids = '1 2 3 4'
     ring_radii = '${fparse pin_diameter/2}
                   ${fparse pin_diameter/2 + 1e-5}
                   ${fparse pin_diameter/2 + 2e-5}'
@@ -64,7 +64,6 @@ height = 1.0
     old_block = '1'
     new_block = 'fuel_pin'
   []
-
 []
 
 [Functions]
@@ -94,7 +93,7 @@ height = 1.0
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime_pin
     diffusion_variable = temperature
diff --git a/modules/subchannel/examples/full-sodium-assembly/wrapper.i b/modules/subchannel/examples/full-sodium-assembly/wrapper.i
index 99dd29582eac..62e9670f0d7f 100644
--- a/modules/subchannel/examples/full-sodium-assembly/wrapper.i
+++ b/modules/subchannel/examples/full-sodium-assembly/wrapper.i
@@ -1,13 +1,13 @@
 # a wrapper mesh for coupling to subchannel
 
 # sqrt(3) / 2 is by how much flat to flat is smaller than corer to corner
-f = ${fparse sqrt(3) / 2}
+f = '${fparse sqrt(3) / 2}'
 
 # units are meters
 height = 1.0
 duct_inside = 0.085
 wrapper_thickness = 0.002
-duct_outside = ${fparse duct_inside + 2 * wrapper_thickness}
+duct_outside = '${fparse duct_inside + 2 * wrapper_thickness}'
 
 # number of radial elements in the wrapper
 n_radial = 4
@@ -29,7 +29,7 @@ T_in = 660
     background_intervals = 1
     background_block_ids = '1'
     # note that polygon_size is "like radius"
-    polygon_size = ${fparse duct_outside / 2}
+    polygon_size = '${fparse duct_outside / 2}'
     duct_sizes = '${fparse duct_inside / 2 / f}'
     duct_intervals = '${n_radial}'
     duct_block_ids = '2'
@@ -129,9 +129,9 @@ T_in = 660
 
 [AuxKernels]
   [QPrime]
-    type = QPrimeDuctAux
+    type = SCMTriDuctQPrimeAux
     diffusivity = 'thermal_conductivity'
-    flat_to_flat = ${fparse duct_inside}
+    flat_to_flat = '${fparse duct_inside}'
     variable = q_prime_d
     diffusion_variable = temperature
     component = normal
@@ -164,7 +164,7 @@ T_in = 660
     type = DirichletBC
     variable = temperature
     boundary = 'outside'
-    value = ${fparse T_in+10}
+    value = '${fparse T_in+10}'
   []
 []
 
diff --git a/modules/subchannel/include/auxkernels/RZQPrimeAuxPin.h b/modules/subchannel/include/auxkernels/SCMRZPinQPrimeAux.h
similarity index 91%
rename from modules/subchannel/include/auxkernels/RZQPrimeAuxPin.h
rename to modules/subchannel/include/auxkernels/SCMRZPinQPrimeAux.h
index c70105cc3f44..400a5dba5318 100644
--- a/modules/subchannel/include/auxkernels/RZQPrimeAuxPin.h
+++ b/modules/subchannel/include/auxkernels/SCMRZPinQPrimeAux.h
@@ -19,12 +19,12 @@
 /**
  * Computes linear heat rate in a 2D-RZ model of a fuel pin
  */
-class RZQPrimeAuxPin : public DiffusionFluxAux
+class SCMRZPinQPrimeAux : public DiffusionFluxAux
 {
 public:
   static InputParameters validParams();
 
-  RZQPrimeAuxPin(const InputParameters & parameters);
+  SCMRZPinQPrimeAux(const InputParameters & parameters);
 
   virtual Real computeValue() override;
 };
diff --git a/modules/subchannel/include/auxkernels/QPrimeDuctAux.h b/modules/subchannel/include/auxkernels/SCMTriDuctQPrimeAux.h
similarity index 89%
rename from modules/subchannel/include/auxkernels/QPrimeDuctAux.h
rename to modules/subchannel/include/auxkernels/SCMTriDuctQPrimeAux.h
index e895fc4ac182..051d8a873bba 100644
--- a/modules/subchannel/include/auxkernels/QPrimeDuctAux.h
+++ b/modules/subchannel/include/auxkernels/SCMTriDuctQPrimeAux.h
@@ -19,16 +19,16 @@
 /**
  * Computes linear heat rate
  */
-class QPrimeDuctAux : public DiffusionFluxAux
+class SCMTriDuctQPrimeAux : public DiffusionFluxAux
 {
 public:
   static InputParameters validParams();
 
-  QPrimeDuctAux(const InputParameters & parameters);
+  SCMTriDuctQPrimeAux(const InputParameters & parameters);
 
   virtual Real computeValue() override;
 
 protected:
-  /// rod diameter
+  /// flat-to-flat distance
   const Real & _flat_to_flat;
 };
diff --git a/modules/subchannel/include/auxkernels/QPrimeDuctFVAux.h b/modules/subchannel/include/auxkernels/SCMTriDuctQPrimeFVAux.h
similarity index 90%
rename from modules/subchannel/include/auxkernels/QPrimeDuctFVAux.h
rename to modules/subchannel/include/auxkernels/SCMTriDuctQPrimeFVAux.h
index ac0eff3e57bc..d38a91a1bb89 100644
--- a/modules/subchannel/include/auxkernels/QPrimeDuctFVAux.h
+++ b/modules/subchannel/include/auxkernels/SCMTriDuctQPrimeFVAux.h
@@ -19,12 +19,12 @@
 /**
  * Computes linear heat rate
  */
-class QPrimeDuctFVAux : public DiffusionFluxFVAux
+class SCMTriDuctQPrimeFVAux : public DiffusionFluxFVAux
 {
 public:
   static InputParameters validParams();
 
-  QPrimeDuctFVAux(const InputParameters & parameters);
+  SCMTriDuctQPrimeFVAux(const InputParameters & parameters);
 
   virtual Real computeValue() override;
 
diff --git a/modules/subchannel/include/postprocessors/PinSurfaceTemperature.h b/modules/subchannel/include/postprocessors/SCMPinSurfaceTemperature.h
similarity index 92%
rename from modules/subchannel/include/postprocessors/PinSurfaceTemperature.h
rename to modules/subchannel/include/postprocessors/SCMPinSurfaceTemperature.h
index 52bc31fd3baa..accf6589ae33 100644
--- a/modules/subchannel/include/postprocessors/PinSurfaceTemperature.h
+++ b/modules/subchannel/include/postprocessors/SCMPinSurfaceTemperature.h
@@ -20,11 +20,11 @@
 /**
  * Returns the surface temperature of a specific fuel pin at a user defined height
  */
-class PinSurfaceTemperature : public GeneralPostprocessor
+class SCMPinSurfaceTemperature : public GeneralPostprocessor
 {
 public:
   static InputParameters validParams();
-  PinSurfaceTemperature(const InputParameters & params);
+  SCMPinSurfaceTemperature(const InputParameters & params);
   virtual void initialize() override {}
   virtual void execute() override;
   virtual void finalize() override {}
diff --git a/modules/subchannel/include/transfers/InterWrapperSolutionTransfer.h b/modules/subchannel/include/transfers/InterWrapperSolutionTransfer.h
index 67441975e5d5..b4cf7eeed2cf 100644
--- a/modules/subchannel/include/transfers/InterWrapperSolutionTransfer.h
+++ b/modules/subchannel/include/transfers/InterWrapperSolutionTransfer.h
@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include "MultiAppInterWrapperSolutionTransferBase.h"
+#include "InterWrapperSolutionTransferBase.h"
 
 /**
  * Transfers inter-wrapper solution from computational mesh onto visualization mesh
  */
-class InterWrapperSolutionTransfer : public MultiAppInterWrapperSolutionTransferBase
+class InterWrapperSolutionTransfer : public InterWrapperSolutionTransferBase
 {
 public:
   InterWrapperSolutionTransfer(const InputParameters & parameters);
diff --git a/modules/subchannel/include/transfers/MultiAppInterWrapperSolutionTransferBase.h b/modules/subchannel/include/transfers/InterWrapperSolutionTransferBase.h
similarity index 92%
rename from modules/subchannel/include/transfers/MultiAppInterWrapperSolutionTransferBase.h
rename to modules/subchannel/include/transfers/InterWrapperSolutionTransferBase.h
index 3851c00533de..c031e5fc9b6b 100644
--- a/modules/subchannel/include/transfers/MultiAppInterWrapperSolutionTransferBase.h
+++ b/modules/subchannel/include/transfers/InterWrapperSolutionTransferBase.h
@@ -21,10 +21,10 @@ class InterWrapperMesh;
 /**
  * Base class for transfering solutions from computational mesh onto visualization mesh
  */
-class MultiAppInterWrapperSolutionTransferBase : public MultiAppTransfer
+class InterWrapperSolutionTransferBase : public MultiAppTransfer
 {
 public:
-  MultiAppInterWrapperSolutionTransferBase(const InputParameters & parameters);
+  InterWrapperSolutionTransferBase(const InputParameters & parameters);
 
   virtual void execute() override;
 
diff --git a/modules/subchannel/include/transfers/SCMPinSolutionTransfer.h b/modules/subchannel/include/transfers/SCMPinSolutionTransfer.h
index 7d8e53dd4322..495dd5e3797d 100644
--- a/modules/subchannel/include/transfers/SCMPinSolutionTransfer.h
+++ b/modules/subchannel/include/transfers/SCMPinSolutionTransfer.h
@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include "MultiAppDetailedSolutionTransferBase.h"
+#include "SCMSolutionTransferBase.h"
 
 /**
  * Transfers subchannel solution from computational mesh onto visualization mesh
  */
-class SCMPinSolutionTransfer : public MultiAppDetailedSolutionTransferBase
+class SCMPinSolutionTransfer : public SCMSolutionTransferBase
 {
 public:
   SCMPinSolutionTransfer(const InputParameters & parameters);
diff --git a/modules/subchannel/include/transfers/SCMSolutionTransfer.h b/modules/subchannel/include/transfers/SCMSolutionTransfer.h
index eb884b06829c..2ef316e9c8b6 100644
--- a/modules/subchannel/include/transfers/SCMSolutionTransfer.h
+++ b/modules/subchannel/include/transfers/SCMSolutionTransfer.h
@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include "MultiAppDetailedSolutionTransferBase.h"
+#include "SCMSolutionTransferBase.h"
 
 /**
  * Transfers subchannel solution from computational mesh onto visualization mesh
  */
-class SCMSolutionTransfer : public MultiAppDetailedSolutionTransferBase
+class SCMSolutionTransfer : public SCMSolutionTransferBase
 {
 public:
   SCMSolutionTransfer(const InputParameters & parameters);
diff --git a/modules/subchannel/include/transfers/MultiAppDetailedSolutionTransferBase.h b/modules/subchannel/include/transfers/SCMSolutionTransferBase.h
similarity index 92%
rename from modules/subchannel/include/transfers/MultiAppDetailedSolutionTransferBase.h
rename to modules/subchannel/include/transfers/SCMSolutionTransferBase.h
index e5d888396b20..5080782edac6 100644
--- a/modules/subchannel/include/transfers/MultiAppDetailedSolutionTransferBase.h
+++ b/modules/subchannel/include/transfers/SCMSolutionTransferBase.h
@@ -21,10 +21,10 @@ class SubChannelMesh;
 /**
  * Base class for transfering solutions from computational mesh onto visualization mesh
  */
-class MultiAppDetailedSolutionTransferBase : public MultiAppTransfer
+class SCMSolutionTransferBase : public MultiAppTransfer
 {
 public:
-  MultiAppDetailedSolutionTransferBase(const InputParameters & parameters);
+  SCMSolutionTransferBase(const InputParameters & parameters);
 
   virtual void execute() override;
 
diff --git a/modules/subchannel/src/auxkernels/RZQPrimeAuxPin.C b/modules/subchannel/src/auxkernels/SCMRZPinQPrimeAux.C
similarity index 82%
rename from modules/subchannel/src/auxkernels/RZQPrimeAuxPin.C
rename to modules/subchannel/src/auxkernels/SCMRZPinQPrimeAux.C
index af38211b2332..ab885b0bd06b 100644
--- a/modules/subchannel/src/auxkernels/RZQPrimeAuxPin.C
+++ b/modules/subchannel/src/auxkernels/SCMRZPinQPrimeAux.C
@@ -12,12 +12,12 @@
 /*               See COPYRIGHT for full restrictions                */
 /********************************************************************/
 
-#include "RZQPrimeAuxPin.h"
+#include "SCMRZPinQPrimeAux.h"
 
-registerMooseObject("MooseApp", RZQPrimeAuxPin);
+registerMooseObject("MooseApp", SCMRZPinQPrimeAux);
 
 InputParameters
-RZQPrimeAuxPin ::validParams()
+SCMRZPinQPrimeAux ::validParams()
 {
   InputParameters params = DiffusionFluxAux::validParams();
   params.addClassDescription(
@@ -25,12 +25,13 @@ RZQPrimeAuxPin ::validParams()
   return params;
 }
 
-RZQPrimeAuxPin ::RZQPrimeAuxPin(const InputParameters & parameters) : DiffusionFluxAux(parameters)
+SCMRZPinQPrimeAux ::SCMRZPinQPrimeAux(const InputParameters & parameters)
+  : DiffusionFluxAux(parameters)
 {
 }
 
 Real
-RZQPrimeAuxPin ::computeValue()
+SCMRZPinQPrimeAux ::computeValue()
 {
   return DiffusionFluxAux::computeValue() * M_PI * 2.0 * abs(_q_point[_qp](0));
 }
diff --git a/modules/subchannel/src/auxkernels/QPrimeDuctAux.C b/modules/subchannel/src/auxkernels/SCMTriDuctQPrimeAux.C
similarity index 84%
rename from modules/subchannel/src/auxkernels/QPrimeDuctAux.C
rename to modules/subchannel/src/auxkernels/SCMTriDuctQPrimeAux.C
index ddf7eaf52418..8e2d7a76a9f4 100644
--- a/modules/subchannel/src/auxkernels/QPrimeDuctAux.C
+++ b/modules/subchannel/src/auxkernels/SCMTriDuctQPrimeAux.C
@@ -12,12 +12,12 @@
 /*               See COPYRIGHT for full restrictions                */
 /********************************************************************/
 
-#include "QPrimeDuctAux.h"
+#include "SCMTriDuctQPrimeAux.h"
 
-registerMooseObject("MooseApp", QPrimeDuctAux);
+registerMooseObject("MooseApp", SCMTriDuctQPrimeAux);
 
 InputParameters
-QPrimeDuctAux::validParams()
+SCMTriDuctQPrimeAux::validParams()
 {
   InputParameters params = DiffusionFluxAux::validParams();
   params.addClassDescription("Axial heat rate on duct surface");
@@ -25,13 +25,13 @@ QPrimeDuctAux::validParams()
   return params;
 }
 
-QPrimeDuctAux::QPrimeDuctAux(const InputParameters & parameters)
+SCMTriDuctQPrimeAux::SCMTriDuctQPrimeAux(const InputParameters & parameters)
   : DiffusionFluxAux(parameters), _flat_to_flat(getParam<Real>("flat_to_flat"))
 {
 }
 
 Real
-QPrimeDuctAux::computeValue()
+SCMTriDuctQPrimeAux::computeValue()
 {
   return DiffusionFluxAux::computeValue() * 6 * _flat_to_flat / std::sqrt(3);
 }
diff --git a/modules/subchannel/src/auxkernels/SCMTriDuctQPrimeFVAux.C b/modules/subchannel/src/auxkernels/SCMTriDuctQPrimeFVAux.C
new file mode 100644
index 000000000000..0622aaf3db58
--- /dev/null
+++ b/modules/subchannel/src/auxkernels/SCMTriDuctQPrimeFVAux.C
@@ -0,0 +1,37 @@
+/********************************************************************/
+/*                   DO NOT MODIFY THIS HEADER                      */
+/*          Subchannel: Thermal Hydraulics Reactor Analysis         */
+/*                                                                  */
+/*              (c) 2022 Battelle Energy Alliance, LLC              */
+/*                      ALL RIGHTS RESERVED                         */
+/*                                                                  */
+/*             Prepared by Battelle Energy Alliance, LLC            */
+/*               Under Contract No. DE-AC07-05ID14517               */
+/*               With the U. S. Department of Energy                */
+/*                                                                  */
+/*               See COPYRIGHT for full restrictions                */
+/********************************************************************/
+
+#include "SCMTriDuctQPrimeFVAux.h"
+
+registerMooseObject("MooseApp", SCMTriDuctQPrimeFVAux);
+
+InputParameters
+SCMTriDuctQPrimeFVAux::validParams()
+{
+  InputParameters params = DiffusionFluxFVAux::validParams();
+  params.addClassDescription("Axial heat rate on duct surface");
+  params.addRequiredParam<Real>("flat_to_flat", "[m]");
+  return params;
+}
+
+SCMTriDuctQPrimeFVAux::SCMTriDuctQPrimeFVAux(const InputParameters & parameters)
+  : DiffusionFluxFVAux(parameters), _flat_to_flat(getParam<Real>("flat_to_flat"))
+{
+}
+
+Real
+SCMTriDuctQPrimeFVAux::computeValue()
+{
+  return DiffusionFluxFVAux::computeValue() * 6 * _flat_to_flat / std::sqrt(3);
+}
diff --git a/modules/subchannel/src/postprocessors/PinSurfaceTemperature.C b/modules/subchannel/src/postprocessors/SCMPinSurfaceTemperature.C
similarity index 84%
rename from modules/subchannel/src/postprocessors/PinSurfaceTemperature.C
rename to modules/subchannel/src/postprocessors/SCMPinSurfaceTemperature.C
index 58435feebb14..95f52d48fa41 100644
--- a/modules/subchannel/src/postprocessors/PinSurfaceTemperature.C
+++ b/modules/subchannel/src/postprocessors/SCMPinSurfaceTemperature.C
@@ -12,7 +12,7 @@
 /*               See COPYRIGHT for full restrictions                */
 /********************************************************************/
 
-#include "PinSurfaceTemperature.h"
+#include "SCMPinSurfaceTemperature.h"
 #include "SolutionHandle.h"
 #include "FEProblemBase.h"
 #include "Function.h"
@@ -21,10 +21,10 @@
 #include "SubProblem.h"
 #include "libmesh/system.h"
 
-registerMooseObject("SubChannelApp", PinSurfaceTemperature);
+registerMooseObject("SubChannelApp", SCMPinSurfaceTemperature);
 
 InputParameters
-PinSurfaceTemperature::validParams()
+SCMPinSurfaceTemperature::validParams()
 {
   InputParameters params = GeneralPostprocessor::validParams();
   params.addClassDescription(
@@ -34,7 +34,7 @@ PinSurfaceTemperature::validParams()
   return params;
 }
 
-PinSurfaceTemperature::PinSurfaceTemperature(const InputParameters & parameters)
+SCMPinSurfaceTemperature::SCMPinSurfaceTemperature(const InputParameters & parameters)
   : GeneralPostprocessor(parameters),
     _mesh(libMesh::cast_ref<SubChannelMesh &>(_fe_problem.mesh())),
     _height(getParam<Real>("height")),
@@ -42,13 +42,14 @@ PinSurfaceTemperature::PinSurfaceTemperature(const InputParameters & parameters)
     _value(0)
 {
   if (!_mesh.pinMeshExist())
-    mooseError(name(),
-               " : The PinSurfaceTemperature post processor calculates temperature on pins. A Pin "
-               "Mesh should be defined.");
+    mooseError(
+        name(),
+        " : The SCMPinSurfaceTemperature post processor calculates temperature on pins. A Pin "
+        "Mesh should be defined.");
 }
 
 void
-PinSurfaceTemperature::execute()
+SCMPinSurfaceTemperature::execute()
 {
   auto Tpin_soln = SolutionHandle(_fe_problem.getVariable(0, "Tpin"));
   auto nz = _mesh.getNumOfAxialCells();
@@ -78,7 +79,7 @@ PinSurfaceTemperature::execute()
 }
 
 Real
-PinSurfaceTemperature::getValue() const
+SCMPinSurfaceTemperature::getValue() const
 {
   return _value;
 }
diff --git a/modules/subchannel/src/transfers/InterWrapperSolutionTransfer.C b/modules/subchannel/src/transfers/InterWrapperSolutionTransfer.C
index af0b58c9e3a8..f42aec68c33c 100644
--- a/modules/subchannel/src/transfers/InterWrapperSolutionTransfer.C
+++ b/modules/subchannel/src/transfers/InterWrapperSolutionTransfer.C
@@ -20,14 +20,14 @@ registerMooseObject("SubChannelApp", InterWrapperSolutionTransfer);
 InputParameters
 InterWrapperSolutionTransfer::validParams()
 {
-  InputParameters params = MultiAppInterWrapperSolutionTransferBase::validParams();
+  InputParameters params = InterWrapperSolutionTransferBase::validParams();
   params.addClassDescription(
       "Transfers Inter-Wrapper solution from computational mesh onto visualization mesh");
   return params;
 }
 
 InterWrapperSolutionTransfer::InterWrapperSolutionTransfer(const InputParameters & parameters)
-  : MultiAppInterWrapperSolutionTransferBase(parameters)
+  : InterWrapperSolutionTransferBase(parameters)
 {
 }
 
diff --git a/modules/subchannel/src/transfers/MultiAppInterWrapperSolutionTransferBase.C b/modules/subchannel/src/transfers/InterWrapperSolutionTransferBase.C
similarity index 89%
rename from modules/subchannel/src/transfers/MultiAppInterWrapperSolutionTransferBase.C
rename to modules/subchannel/src/transfers/InterWrapperSolutionTransferBase.C
index 235dcc1f9a5b..06745cd97086 100644
--- a/modules/subchannel/src/transfers/MultiAppInterWrapperSolutionTransferBase.C
+++ b/modules/subchannel/src/transfers/InterWrapperSolutionTransferBase.C
@@ -12,14 +12,14 @@
 /*               See COPYRIGHT for full restrictions                */
 /********************************************************************/
 
-#include "MultiAppInterWrapperSolutionTransferBase.h"
+#include "InterWrapperSolutionTransferBase.h"
 #include "MultiApp.h"
 #include "FEProblemBase.h"
 #include "DisplacedProblem.h"
 #include "InterWrapperMesh.h"
 
 InputParameters
-MultiAppInterWrapperSolutionTransferBase::validParams()
+InterWrapperSolutionTransferBase::validParams()
 {
   InputParameters params = MultiAppTransfer::validParams();
   params.addRequiredParam<std::vector<AuxVariableName>>("variable",
@@ -27,7 +27,7 @@ MultiAppInterWrapperSolutionTransferBase::validParams()
   return params;
 }
 
-MultiAppInterWrapperSolutionTransferBase::MultiAppInterWrapperSolutionTransferBase(
+InterWrapperSolutionTransferBase::InterWrapperSolutionTransferBase(
     const InputParameters & parameters)
   : MultiAppTransfer(parameters), _var_names(getParam<std::vector<AuxVariableName>>("variable"))
 {
@@ -36,7 +36,7 @@ MultiAppInterWrapperSolutionTransferBase::MultiAppInterWrapperSolutionTransferBa
 }
 
 void
-MultiAppInterWrapperSolutionTransferBase::execute()
+InterWrapperSolutionTransferBase::execute()
 {
   getAppInfo();
 
@@ -52,7 +52,7 @@ MultiAppInterWrapperSolutionTransferBase::execute()
 }
 
 void
-MultiAppInterWrapperSolutionTransferBase::transferToMultiApps()
+InterWrapperSolutionTransferBase::transferToMultiApps()
 {
   mooseAssert(_from_meshes.size() == 1, "Only one master mesh can be active in this transfer.");
   if (dynamic_cast<InterWrapperMesh *>(_from_meshes[0]) == nullptr)
@@ -64,13 +64,13 @@ MultiAppInterWrapperSolutionTransferBase::transferToMultiApps()
 }
 
 void
-MultiAppInterWrapperSolutionTransferBase::transferVarsToApp(unsigned int app_idx)
+InterWrapperSolutionTransferBase::transferVarsToApp(unsigned int app_idx)
 {
   transferNodalVars(app_idx);
 }
 
 void
-MultiAppInterWrapperSolutionTransferBase::transferNodalVars(unsigned int app_idx)
+InterWrapperSolutionTransferBase::transferNodalVars(unsigned int app_idx)
 {
   Moose::ScopedCommSwapper swapper(_multi_app->comm());
 
diff --git a/modules/subchannel/src/transfers/SCMPinSolutionTransfer.C b/modules/subchannel/src/transfers/SCMPinSolutionTransfer.C
index efc007ae7df9..c385cd80b1b1 100644
--- a/modules/subchannel/src/transfers/SCMPinSolutionTransfer.C
+++ b/modules/subchannel/src/transfers/SCMPinSolutionTransfer.C
@@ -20,14 +20,14 @@ registerMooseObject("SubChannelApp", SCMPinSolutionTransfer);
 InputParameters
 SCMPinSolutionTransfer::validParams()
 {
-  InputParameters params = MultiAppDetailedSolutionTransferBase::validParams();
+  InputParameters params = SCMSolutionTransferBase::validParams();
   params.addClassDescription(
       "Transfers subchannel solution from computational mesh onto visualization mesh");
   return params;
 }
 
 SCMPinSolutionTransfer::SCMPinSolutionTransfer(const InputParameters & parameters)
-  : MultiAppDetailedSolutionTransferBase(parameters)
+  : SCMSolutionTransferBase(parameters)
 {
 }
 
diff --git a/modules/subchannel/src/transfers/SCMSolutionTransfer.C b/modules/subchannel/src/transfers/SCMSolutionTransfer.C
index 804aefe482a1..3d2833f57efe 100644
--- a/modules/subchannel/src/transfers/SCMSolutionTransfer.C
+++ b/modules/subchannel/src/transfers/SCMSolutionTransfer.C
@@ -20,14 +20,14 @@ registerMooseObject("SubChannelApp", SCMSolutionTransfer);
 InputParameters
 SCMSolutionTransfer::validParams()
 {
-  InputParameters params = MultiAppDetailedSolutionTransferBase::validParams();
+  InputParameters params = SCMSolutionTransferBase::validParams();
   params.addClassDescription(
       "Transfers subchannel solution from computational mesh onto visualization mesh");
   return params;
 }
 
 SCMSolutionTransfer::SCMSolutionTransfer(const InputParameters & parameters)
-  : MultiAppDetailedSolutionTransferBase(parameters)
+  : SCMSolutionTransferBase(parameters)
 {
 }
 
diff --git a/modules/subchannel/src/transfers/MultiAppDetailedSolutionTransferBase.C b/modules/subchannel/src/transfers/SCMSolutionTransferBase.C
similarity index 89%
rename from modules/subchannel/src/transfers/MultiAppDetailedSolutionTransferBase.C
rename to modules/subchannel/src/transfers/SCMSolutionTransferBase.C
index 8af279e78bf2..24d513bb8926 100644
--- a/modules/subchannel/src/transfers/MultiAppDetailedSolutionTransferBase.C
+++ b/modules/subchannel/src/transfers/SCMSolutionTransferBase.C
@@ -12,14 +12,14 @@
 /*               See COPYRIGHT for full restrictions                */
 /********************************************************************/
 
-#include "MultiAppDetailedSolutionTransferBase.h"
+#include "SCMSolutionTransferBase.h"
 #include "MultiApp.h"
 #include "FEProblemBase.h"
 #include "DisplacedProblem.h"
 #include "SubChannelMesh.h"
 
 InputParameters
-MultiAppDetailedSolutionTransferBase::validParams()
+SCMSolutionTransferBase::validParams()
 {
   InputParameters params = MultiAppTransfer::validParams();
   params.addRequiredParam<std::vector<AuxVariableName>>("variable",
@@ -27,8 +27,7 @@ MultiAppDetailedSolutionTransferBase::validParams()
   return params;
 }
 
-MultiAppDetailedSolutionTransferBase::MultiAppDetailedSolutionTransferBase(
-    const InputParameters & parameters)
+SCMSolutionTransferBase::SCMSolutionTransferBase(const InputParameters & parameters)
   : MultiAppTransfer(parameters), _var_names(getParam<std::vector<AuxVariableName>>("variable"))
 {
   if (_directions.contains(Transfer::FROM_MULTIAPP))
@@ -36,7 +35,7 @@ MultiAppDetailedSolutionTransferBase::MultiAppDetailedSolutionTransferBase(
 }
 
 void
-MultiAppDetailedSolutionTransferBase::execute()
+SCMSolutionTransferBase::execute()
 {
   TIME_SECTION(
       "MultiAppDetailedSolutionBaseTransfer::execute()", 5, "Transferring subchannel solutions");
@@ -55,7 +54,7 @@ MultiAppDetailedSolutionTransferBase::execute()
 }
 
 void
-MultiAppDetailedSolutionTransferBase::transferToMultiApps()
+SCMSolutionTransferBase::transferToMultiApps()
 {
   _console << "********** Transfer to MultiApps a **********" << std::endl;
   mooseAssert(_from_meshes.size() == 1, "Only one master mesh can be active in this transfer.");
@@ -68,13 +67,13 @@ MultiAppDetailedSolutionTransferBase::transferToMultiApps()
 }
 
 void
-MultiAppDetailedSolutionTransferBase::transferVarsToApp(unsigned int app_idx)
+SCMSolutionTransferBase::transferVarsToApp(unsigned int app_idx)
 {
   transferNodalVars(app_idx);
 }
 
 void
-MultiAppDetailedSolutionTransferBase::transferNodalVars(unsigned int app_idx)
+SCMSolutionTransferBase::transferNodalVars(unsigned int app_idx)
 {
   Moose::ScopedCommSwapper swapper(getToMultiApp()->comm());
 
diff --git a/modules/subchannel/test/tests/auxkernels/q_prime/test.i b/modules/subchannel/test/tests/auxkernels/q_prime/test.i
index 379a5f309553..7e5328fd85f8 100644
--- a/modules/subchannel/test/tests/auxkernels/q_prime/test.i
+++ b/modules/subchannel/test/tests/auxkernels/q_prime/test.i
@@ -32,7 +32,7 @@ heated_length = 1.0
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
@@ -50,7 +50,7 @@ heated_length = 1.0
   [heat_source]
     type = HeatSource
     variable = temperature
-    value = ${fparse 4.0 * 1000 / (pi * pin_diameter * pin_diameter * heated_length)}
+    value = '${fparse 4.0 * 1000 / (pi * pin_diameter * pin_diameter * heated_length)}'
   []
 []
 
diff --git a/modules/subchannel/test/tests/problems/SFR/sodium-19pin/test19_monolithic.i b/modules/subchannel/test/tests/problems/SFR/sodium-19pin/test19_monolithic.i
index 267e7770a74c..5482e1169944 100644
--- a/modules/subchannel/test/tests/problems/SFR/sodium-19pin/test19_monolithic.i
+++ b/modules/subchannel/test/tests/problems/SFR/sodium-19pin/test19_monolithic.i
@@ -205,7 +205,7 @@ P_out = 2.0e5 # Pa
   []
 
   [PinTemp]
-    type = PinSurfaceTemperature
+    type = SCMPinSurfaceTemperature
     index = 10
     height = 2
   []
diff --git a/modules/subchannel/test/tests/problems/coupling/sub.i b/modules/subchannel/test/tests/problems/coupling/sub.i
index bdc9835ffc6e..0876bd7009e9 100644
--- a/modules/subchannel/test/tests/problems/coupling/sub.i
+++ b/modules/subchannel/test/tests/problems/coupling/sub.i
@@ -35,7 +35,7 @@ heated_length = 1.0
 
 [AuxKernels]
   [QPrime]
-    type = RZQPrimeAuxPin
+    type = SCMRZPinQPrimeAux
     diffusivity = 'thermal_conductivity'
     variable = q_prime
     diffusion_variable = temperature
@@ -53,7 +53,7 @@ heated_length = 1.0
   [heat_source]
     type = HeatSource
     variable = temperature
-    value = ${fparse 4.0 * 1000 / (pi * pin_diameter * pin_diameter * heated_length)}
+    value = '${fparse 4.0 * 1000 / (pi * pin_diameter * pin_diameter * heated_length)}'
   []
 []
 
diff --git a/modules/subchannel/test/tests/problems/psbt/psbt_implicit.i b/modules/subchannel/test/tests/problems/psbt/psbt_implicit.i
index 2a2e52520767..33ae3c563a97 100644
--- a/modules/subchannel/test/tests/problems/psbt/psbt_implicit.i
+++ b/modules/subchannel/test/tests/problems/psbt/psbt_implicit.i
@@ -202,7 +202,7 @@ P_out = 4.923e6 # Pa
 
 [Postprocessors]
   [PinTemp]
-    type = PinSurfaceTemperature
+    type = SCMPinSurfaceTemperature
     index = 10
     height = 0.5
   []