diff --git a/src/GRANULAR/gran_sub_mod.h b/src/GRANULAR/gran_sub_mod.h
index 78f4229b29..b2335e8cfb 100644
--- a/src/GRANULAR/gran_sub_mod.h
+++ b/src/GRANULAR/gran_sub_mod.h
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#ifndef LMP_GRAN_SUB_MOD_H_
-#define LMP_GRAN_SUB_MOD_H_
+#ifndef LMP_GRAN_SUB_MOD_H
+#define LMP_GRAN_SUB_MOD_H
 
 #include "granular_model.h"
 #include "pointers.h"    // IWYU pragma: export
@@ -59,4 +59,4 @@ class GranSubMod : protected Pointers {
 }    // namespace GranularModel
 }    // namespace LAMMPS_NS
 
-#endif /* GRAN_SUB_MOD_H_ */
+#endif /* GRAN_SUB_MOD_H */
diff --git a/src/GRANULAR/gran_sub_mod_damping.h b/src/GRANULAR/gran_sub_mod_damping.h
index 04316a950d..e5f4227ce8 100644
--- a/src/GRANULAR/gran_sub_mod_damping.h
+++ b/src/GRANULAR/gran_sub_mod_damping.h
@@ -35,8 +35,8 @@ GranSubModStyle(tsuji,
 // clang-format on
 #else
 
-#ifndef GRAN_SUB_MOD_DAMPING_H_
-#define GRAN_SUB_MOD_DAMPING_H_
+#ifndef GRAN_SUB_MOD_DAMPING_H
+#define GRAN_SUB_MOD_DAMPING_H
 
 #include "gran_sub_mod.h"
 #include "pointers.h"
@@ -102,5 +102,5 @@ class GranSubModDampingTsuji : public GranSubModDamping {
 }    // namespace Granular_NS
 }    // namespace LAMMPS_NS
 
-#endif /*GRAN_SUB_MOD_DAMPING_H_ */
-#endif /*GRAN_SUB_MOD_CLASS_H_ */
+#endif /*GRAN_SUB_MOD_DAMPING_H */
+#endif /*GRAN_SUB_MOD_CLASS_H */
diff --git a/src/GRANULAR/gran_sub_mod_heat.h b/src/GRANULAR/gran_sub_mod_heat.h
index 3520a41a06..a5408a0fc2 100644
--- a/src/GRANULAR/gran_sub_mod_heat.h
+++ b/src/GRANULAR/gran_sub_mod_heat.h
@@ -23,8 +23,8 @@ GranSubModStyle(area,
 // clang-format on
 #else
 
-#ifndef GRAN_SUB_MOD_HEAT_H_
-#define GRAN_SUB_MOD_HEAT_H_
+#ifndef GRAN_SUB_MOD_HEAT_H
+#define GRAN_SUB_MOD_HEAT_H
 
 #include "gran_sub_mod.h"
 
@@ -62,5 +62,5 @@ class GranSubModHeatArea : public GranSubModHeat {
 }    // namespace Granular_NS
 }    // namespace LAMMPS_NS
 
-#endif /*GRAN_SUB_MOD_HEAT_H_ */
-#endif /*GRAN_SUB_MOD_CLASS_H_ */
+#endif /*GRAN_SUB_MOD_HEAT_H */
+#endif /*GRAN_SUB_MOD_CLASS_H */
diff --git a/src/GRANULAR/gran_sub_mod_normal.h b/src/GRANULAR/gran_sub_mod_normal.h
index 8fb0c01d4b..49e7d012c4 100644
--- a/src/GRANULAR/gran_sub_mod_normal.h
+++ b/src/GRANULAR/gran_sub_mod_normal.h
@@ -39,8 +39,8 @@ GranSubModStyle(jkr,
 // clang-format on
 #else
 
-#ifndef GRAN_SUB_MOD_NORMAL_H_
-#define GRAN_SUB_MOD_NORMAL_H_
+#ifndef GRAN_SUB_MOD_NORMAL_H
+#define GRAN_SUB_MOD_NORMAL_H
 
 #include "gran_sub_mod.h"
 
@@ -137,5 +137,5 @@ class GranSubModNormalJKR : public GranSubModNormal {
 }    // namespace Granular_NS
 }    // namespace LAMMPS_NS
 
-#endif /*GRAN_SUB_MOD_NORMAL_H_ */
-#endif /*GRAN_SUB_MOD_CLASS_H_ */
+#endif /*GRAN_SUB_MOD_NORMAL_H */
+#endif /*GRAN_SUB_MOD_CLASS_H */
diff --git a/src/GRANULAR/gran_sub_mod_rolling.h b/src/GRANULAR/gran_sub_mod_rolling.h
index cb64c94219..5739067f50 100644
--- a/src/GRANULAR/gran_sub_mod_rolling.h
+++ b/src/GRANULAR/gran_sub_mod_rolling.h
@@ -23,8 +23,8 @@ GranSubModStyle(sds,
 // clang-format on
 #else
 
-#ifndef GRAN_SUB_MOD_ROLLING_H_
-#define GRAN_SUB_MOD_ROLLING_H_
+#ifndef GRAN_SUB_MOD_ROLLING_H
+#define GRAN_SUB_MOD_ROLLING_H
 
 #include "gran_sub_mod.h"
 
@@ -62,5 +62,5 @@ class GranSubModRollingSDS : public GranSubModRolling {
 }    // namespace Granular_NS
 }    // namespace LAMMPS_NS
 
-#endif /*GRAN_SUB_MOD_ROLLING_H_ */
-#endif /*GRAN_SUB_MOD_CLASS_H_ */
+#endif /*GRAN_SUB_MOD_ROLLING_H */
+#endif /*GRAN_SUB_MOD_CLASS_H */
diff --git a/src/GRANULAR/gran_sub_mod_tangential.h b/src/GRANULAR/gran_sub_mod_tangential.h
index 56d72f80d3..b5a195a1d6 100644
--- a/src/GRANULAR/gran_sub_mod_tangential.h
+++ b/src/GRANULAR/gran_sub_mod_tangential.h
@@ -51,8 +51,8 @@ GranSubModStyle(mindlin_rescale/force,
 // clang-format on
 #else
 
-#ifndef GRAN_SUB_MOD_TANGENTIAL_H_
-#define GRAN_SUB_MOD_TANGENTIAL_H_
+#ifndef GRAN_SUB_MOD_TANGENTIAL_H
+#define GRAN_SUB_MOD_TANGENTIAL_H
 
 #include "gran_sub_mod.h"
 
@@ -153,5 +153,5 @@ class GranSubModTangentialMindlinRescaleForce : public GranSubModTangentialMindl
 }    // namespace Granular_NS
 }    // namespace LAMMPS_NS
 
-#endif /*GRAN_SUB_MOD_TANGENTIAL_H_ */
-#endif /*GRAN_SUB_MOD_CLASS_H_ */
+#endif /*GRAN_SUB_MOD_TANGENTIAL_H */
+#endif /*GRAN_SUB_MOD_CLASS_H */
diff --git a/src/GRANULAR/gran_sub_mod_twisting.h b/src/GRANULAR/gran_sub_mod_twisting.h
index 7f8addec97..c365cba331 100644
--- a/src/GRANULAR/gran_sub_mod_twisting.h
+++ b/src/GRANULAR/gran_sub_mod_twisting.h
@@ -27,8 +27,8 @@ GranSubModStyle(sds,
 // clang-format on
 #else
 
-#ifndef GRAN_SUB_MOD_TWISTING_H_
-#define GRAN_SUB_MOD_TWISTING_H_
+#ifndef GRAN_SUB_MOD_TWISTING_H
+#define GRAN_SUB_MOD_TWISTING_H
 
 #include "gran_sub_mod.h"
 
@@ -77,5 +77,5 @@ class GranSubModTwistingSDS : public GranSubModTwisting {
 }    // namespace Granular_NS
 }    // namespace LAMMPS_NS
 
-#endif /*GRAN_SUB_MOD_TWISTING_H_ */
-#endif /*GRAN_SUB_MOD_CLASS_H_ */
+#endif /*GRAN_SUB_MOD_TWISTING_H */
+#endif /*GRAN_SUB_MOD_CLASS_H */
diff --git a/src/GRANULAR/granular_model.cpp b/src/GRANULAR/granular_model.cpp
index 872bfa6c8d..47d84b2495 100644
--- a/src/GRANULAR/granular_model.cpp
+++ b/src/GRANULAR/granular_model.cpp
@@ -68,25 +68,25 @@ GranularModel::GranularModel(LAMMPS *lmp) : Pointers(lmp)
 
   nclass = 0;
 
-#define GRANSUBMOD_CLASS
+#define GRAN_SUB_MOD_CLASS
 #define GranSubModStyle(key,Class,type) nclass++;
 #include "style_gran_sub_mod.h"  // IWYU pragma: keep
 #undef GranSubModStyle
-#undef GRANSUBMOD_CLASS
+#undef GRAN_SUB_MOD_CLASS
 
   gran_sub_mod_class = new GranSubModCreator[nclass];
   gran_sub_mod_names = new char*[nclass];
   gran_sub_mod_types = new int[nclass];
   nclass = 0;
 
-#define GRANSUBMOD_CLASS
+#define GRAN_SUB_MOD_CLASS
 #define GranSubModStyle(key,Class,type) \
   gran_sub_mod_class[nclass] = &gran_sub_mod_creator<Class>;   \
   gran_sub_mod_names[nclass] = (char *) #key; \
   gran_sub_mod_types[nclass++] = type;
 #include "style_gran_sub_mod.h"  // IWYU pragma: keep
 #undef GranSubModStyle
-#undef GRANSUBMOD_CLASS
+#undef GRAN_SUB_MOD_CLASS
 }
 
 /* ---------------------------------------------------------------------- */