diff --git a/src/USER-SMD/compute_smd_contact_radius.h b/src/USER-SMD/compute_smd_contact_radius.h
index 9acb8e3b17..46034f2f11 100644
--- a/src/USER-SMD/compute_smd_contact_radius.h
+++ b/src/USER-SMD/compute_smd_contact_radius.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/contact_radius,ComputeSMDContactRadius)
+ComputeStyle(smd/contact/radius,ComputeSMDContactRadius)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_hourglass_error.h b/src/USER-SMD/compute_smd_hourglass_error.h
index fdfbfae641..d4e39ce25f 100644
--- a/src/USER-SMD/compute_smd_hourglass_error.h
+++ b/src/USER-SMD/compute_smd_hourglass_error.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/hourglass_error,ComputeSMDHourglassError)
+ComputeStyle(smd/hourglass/error,ComputeSMDHourglassError)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_internal_energy.h b/src/USER-SMD/compute_smd_internal_energy.h
index 4276a6ee60..0754f6fe6c 100644
--- a/src/USER-SMD/compute_smd_internal_energy.h
+++ b/src/USER-SMD/compute_smd_internal_energy.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/internal_energy,ComputeSMDInternalEnergy)
+ComputeStyle(smd/internal/energy,ComputeSMDInternalEnergy)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_plastic_strain.h b/src/USER-SMD/compute_smd_plastic_strain.h
index 30b191ee2e..cdc322e4cf 100644
--- a/src/USER-SMD/compute_smd_plastic_strain.h
+++ b/src/USER-SMD/compute_smd_plastic_strain.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/plastic_strain,ComputeSMDPlasticStrain)
+ComputeStyle(smd/plastic/strain,ComputeSMDPlasticStrain)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_plastic_strain_rate.h b/src/USER-SMD/compute_smd_plastic_strain_rate.h
index 1d99ac0baa..efc4f0c67c 100644
--- a/src/USER-SMD/compute_smd_plastic_strain_rate.h
+++ b/src/USER-SMD/compute_smd_plastic_strain_rate.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/plastic_strain_rate,ComputeSMDPlasticStrainRate)
+ComputeStyle(smd/plastic/strain/rate,ComputeSMDPlasticStrainRate)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_defgrad.h b/src/USER-SMD/compute_smd_tlsph_defgrad.h
index 211b906485..654403e7a3 100644
--- a/src/USER-SMD/compute_smd_tlsph_defgrad.h
+++ b/src/USER-SMD/compute_smd_tlsph_defgrad.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_defgrad,ComputeSMDTLSPHDefgrad)
+ComputeStyle(smd/tlsph/defgrad,ComputeSMDTLSPHDefgrad)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_dt.h b/src/USER-SMD/compute_smd_tlsph_dt.h
index 0b258a1a7f..16969a05be 100644
--- a/src/USER-SMD/compute_smd_tlsph_dt.h
+++ b/src/USER-SMD/compute_smd_tlsph_dt.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_dt,ComputeSMDTlsphDt)
+ComputeStyle(smd/tlsph/dt,ComputeSMDTlsphDt)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_num_neighs.h b/src/USER-SMD/compute_smd_tlsph_num_neighs.h
index 5b3613e05c..77e4c5838c 100644
--- a/src/USER-SMD/compute_smd_tlsph_num_neighs.h
+++ b/src/USER-SMD/compute_smd_tlsph_num_neighs.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_num_neighs,ComputeSMDTLSPHNumNeighs)
+ComputeStyle(smd/tlsph/num/neighs,ComputeSMDTLSPHNumNeighs)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_shape.h b/src/USER-SMD/compute_smd_tlsph_shape.h
index dc5a98618b..167e2b67e4 100644
--- a/src/USER-SMD/compute_smd_tlsph_shape.h
+++ b/src/USER-SMD/compute_smd_tlsph_shape.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_shape,ComputeSmdTlsphShape)
+ComputeStyle(smd/tlsph/shape,ComputeSmdTlsphShape)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_strain.h b/src/USER-SMD/compute_smd_tlsph_strain.h
index 0dcd53b9a2..199190c8b9 100644
--- a/src/USER-SMD/compute_smd_tlsph_strain.h
+++ b/src/USER-SMD/compute_smd_tlsph_strain.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_strain,ComputeSMDTLSPHstrain)
+ComputeStyle(smd/tlsph/strain,ComputeSMDTLSPHstrain)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_strain_rate.h b/src/USER-SMD/compute_smd_tlsph_strain_rate.h
index d3425e6fdc..9924f5e1cc 100644
--- a/src/USER-SMD/compute_smd_tlsph_strain_rate.h
+++ b/src/USER-SMD/compute_smd_tlsph_strain_rate.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_strain_rate,ComputeSMDTLSPHStrainRate)
+ComputeStyle(smd/tlsph/strain/rate,ComputeSMDTLSPHStrainRate)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_tlsph_stress.h b/src/USER-SMD/compute_smd_tlsph_stress.h
index 027bfea98a..3a8f6610b1 100644
--- a/src/USER-SMD/compute_smd_tlsph_stress.h
+++ b/src/USER-SMD/compute_smd_tlsph_stress.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/tlsph_stress, ComputeSMDTLSPHStress)
+ComputeStyle(smd/tlsph/stress, ComputeSMDTLSPHStress)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_triangle_mesh_vertices.h b/src/USER-SMD/compute_smd_triangle_mesh_vertices.h
index a99330b0eb..1a4ff295bb 100644
--- a/src/USER-SMD/compute_smd_triangle_mesh_vertices.h
+++ b/src/USER-SMD/compute_smd_triangle_mesh_vertices.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/triangle_vertices,ComputeSMDTriangleVertices)
+ComputeStyle(smd/triangle/vertices,ComputeSMDTriangleVertices)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_ulsph_effm.h b/src/USER-SMD/compute_smd_ulsph_effm.h
index d4fb9180fe..3c2abd851d 100644
--- a/src/USER-SMD/compute_smd_ulsph_effm.h
+++ b/src/USER-SMD/compute_smd_ulsph_effm.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/ulsph_effm,ComputeSMD_Ulsph_Effm)
+ComputeStyle(smd/ulsph/effm,ComputeSMD_Ulsph_Effm)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_ulsph_num_neighs.h b/src/USER-SMD/compute_smd_ulsph_num_neighs.h
index c16d178666..5af3bd9302 100644
--- a/src/USER-SMD/compute_smd_ulsph_num_neighs.h
+++ b/src/USER-SMD/compute_smd_ulsph_num_neighs.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/ulsph_num_neighs,ComputeSMDULSPHNumNeighs)
+ComputeStyle(smd/ulsph/num/neighs,ComputeSMDULSPHNumNeighs)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_ulsph_strain.h b/src/USER-SMD/compute_smd_ulsph_strain.h
index 43aaa173bf..2e266f4e25 100644
--- a/src/USER-SMD/compute_smd_ulsph_strain.h
+++ b/src/USER-SMD/compute_smd_ulsph_strain.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/ulsph_strain,ComputeSMDULSPHstrain)
+ComputeStyle(smd/ulsph/strain,ComputeSMDULSPHstrain)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_ulsph_strain_rate.h b/src/USER-SMD/compute_smd_ulsph_strain_rate.h
index e80d508abd..d2d43ef972 100644
--- a/src/USER-SMD/compute_smd_ulsph_strain_rate.h
+++ b/src/USER-SMD/compute_smd_ulsph_strain_rate.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/ulsph_strain_rate,ComputeSMDULSPHStrainRate)
+ComputeStyle(smd/ulsph/strain/rate,ComputeSMDULSPHStrainRate)
 
 #else
 
diff --git a/src/USER-SMD/compute_smd_ulsph_stress.h b/src/USER-SMD/compute_smd_ulsph_stress.h
index 04de0a7304..c962449703 100644
--- a/src/USER-SMD/compute_smd_ulsph_stress.h
+++ b/src/USER-SMD/compute_smd_ulsph_stress.h
@@ -25,7 +25,7 @@
 
 #ifdef COMPUTE_CLASS
 
-ComputeStyle(smd/ulsph_stress, ComputeSMDULSPHStress)
+ComputeStyle(smd/ulsph/stress, ComputeSMDULSPHStress)
 
 #else