diff --git a/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp b/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
index 10a81b191e..b75bab10e9 100644
--- a/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
+++ b/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
@@ -103,14 +103,14 @@ fix             integration_fix tlsph smd/integrate_tlsph
 ####################################################################################################
 # SPECIFY TRAJECTORY OUTPUT
 ####################################################################################################
-compute         dt_atom all smd/tlsph_dt
-compute 	p all smd/plastic_strain
-compute 	epsdot all smd/plastic_strain_rate
-compute 	S all smd/tlsph_stress # Cauchy stress tensor
-compute 	D all smd/tlsph_strain_rate
-compute 	E all smd/tlsph_strain
-compute 	nn all smd/tlsph_num_neighs # number of neighbors for each particle
-compute         shape all smd/tlsph_shape
+compute         dt_atom all smd/tlsph/dt
+compute 	p all smd/plastic/strain
+compute 	epsdot all smd/plastic/strain/rate
+compute 	S all smd/tlsph/stress # Cauchy stress tensor
+compute 	D all smd/tlsph/strain/rate
+compute 	E all smd/tlsph/strain
+compute 	nn all smd/tlsph/num/neighs # number of neighbors for each particle
+compute         shape all smd/tlsph/shape
 compute 	damage all smd/damage
 dump 		dump_id all custom 100 dump.LAMMPS id type x y z &
 			c_S[1] c_S[2] c_S[3] c_S[4] c_S[5] c_S[6] c_S[7] c_nn c_p &
diff --git a/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp b/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
index 18b047417d..5100a52d84 100644
--- a/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
+++ b/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
@@ -124,11 +124,11 @@ fix             integration_fix_solids solids smd/integrate_tlsph
 ####################################################################################################
 # SPECIFY TRAJECTORY OUTPUT
 ####################################################################################################
-compute         eint all smd/internal_energy
-compute         contact_radius all smd/contact_radius
-compute         S solids smd/tlsph_stress
-compute         nn water smd/ulsph_num_neighs
-compute         epl solids smd/plastic_strain
+compute         eint all smd/internal/energy
+compute         contact_radius all smd/contact/radius
+compute         S solids smd/tlsph/stress
+compute         nn water smd/ulsph/num/neighs
+compute         epl solids smd/plastic/strain
 compute         vol all smd/volume
 compute         rho all smd/rho
 
diff --git a/examples/USER/smd/funnel_flow/funnel_flow.lmp b/examples/USER/smd/funnel_flow/funnel_flow.lmp
index 5195b55be8..7cc1e13f4f 100644
--- a/examples/USER/smd/funnel_flow/funnel_flow.lmp
+++ b/examples/USER/smd/funnel_flow/funnel_flow.lmp
@@ -98,9 +98,9 @@ fix             integration_fix all smd/integrate_ulsph adjust_radius 1.01 10 15
 ####################################################################################################
 variable        dumpFreq equal 100
 compute 	rho all smd/rho
-compute 	nn all smd/ulsph_num_neighs # number of neighbors for each particle
-compute         contact_radius all smd/contact_radius
-compute         surface_coords surface smd/triangle_vertices
+compute 	nn all smd/ulsph/num/neighs # number of neighbors for each particle
+compute         contact_radius all smd/contact/radius
+compute         surface_coords surface smd/triangle/vertices
 
 
 dump 		dump_id water custom ${dumpFreq} dump.LAMMPS id type x y z vx vy vz &
@@ -116,7 +116,7 @@ dump_modify 	surf_dump first yes
 ####################################################################################################
 # STATUS OUTPUT
 ####################################################################################################
-compute         eint all smd/internal_energy
+compute         eint all smd/internal/energy
 compute         alleint all reduce sum c_eint
 variable        etot equal pe+ke+c_alleint+f_gfix # total energy of the system
 thermo 100
diff --git a/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp b/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
index d2ede85c08..956abd6c4a 100644
--- a/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
+++ b/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
@@ -88,11 +88,11 @@ fix             integration_fix tlsph smd/integrate_tlsph
 # SPECIFY TRAJECTORY OUTPUT
 ####################################################################################################
 variable        dumpFreq equal 30
-compute         S all smd/tlsph_stress # Cauchy stress tensor
-compute         nn all smd/tlsph_num_neighs # number of neighbors for each particle
-compute         cr all smd/contact_radius
-compute         p all smd/plastic_strain
-compute         eint all smd/internal_energy
+compute         S all smd/tlsph/stress # Cauchy stress tensor
+compute         nn all smd/tlsph/num/neighs # number of neighbors for each particle
+compute         cr all smd/contact/radius
+compute         p all smd/plastic/strain
+compute         eint all smd/internal/energy
 compute         alleint all reduce sum c_eint
 variable        etot equal c_alleint+ke+pe
 
diff --git a/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp b/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp
index 88a7c896a5..4e53daf993 100644
--- a/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp
+++ b/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp
@@ -49,7 +49,7 @@ variable        vol_one equal ${l0}^2 # volume of one particle -- assuming unit
 variable        skin equal ${h} # Verlet list range
 neighbor        ${skin} bin
 set             group all volume ${vol_one}
-set             group all smd_mass_density ${rho}
+set             group all smd/mass/density ${rho}
 set             group all diameter ${h} # set SPH kernel radius
 
 ####################################################################################################
@@ -83,9 +83,9 @@ fix             integration_fix tlsph smd/integrate_tlsph
 ####################################################################################################
 # SPECIFY TRAJECTORY OUTPUT
 ####################################################################################################
-compute         S all smd/tlsph_stress # Cauchy stress tensor
-compute         E all smd/tlsph_strain # Green-Lagrange strain tensor
-compute         nn all smd/tlsph_num_neighs # number of neighbors for each particle
+compute         S all smd/tlsph/stress # Cauchy stress tensor
+compute         E all smd/tlsph/strain # Green-Lagrange strain tensor
+compute         nn all smd/tlsph/num/neighs # number of neighbors for each particle
 dump            dump_id all custom 10 dump.LAMMPS id type x y z vx vy vz &
                         c_S[1] c_S[2] c_S[4] c_nn &
                         c_E[1] c_E[2] c_E[4] &