diff --git a/include/EntityManager.hpp b/include/entity_manager.hpp
similarity index 98%
rename from include/EntityManager.hpp
rename to include/entity_manager.hpp
index 2d79e1f..a851866 100644
--- a/include/EntityManager.hpp
+++ b/include/entity_manager.hpp
@@ -13,11 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-/// \file EntityManager.hpp
+/// \file entity_manager.hpp
 
 #pragma once
 
-#include "Utils.hpp"
+#include "utils.hpp"
 
 #include <systemd/sd-journal.h>
 
diff --git a/include/Expression.hpp b/include/expression.hpp
similarity index 100%
rename from include/Expression.hpp
rename to include/expression.hpp
diff --git a/include/FruUtils.hpp b/include/fru_utils.hpp
similarity index 99%
rename from include/FruUtils.hpp
rename to include/fru_utils.hpp
index 8d94876..c072ae5 100644
--- a/include/FruUtils.hpp
+++ b/include/fru_utils.hpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-/// \file FruUtils.hpp
+/// \file fru_utils.hpp
 
 #pragma once
 #include <boost/container/flat_map.hpp>
diff --git a/include/Overlay.hpp b/include/overlay.hpp
similarity index 97%
rename from include/Overlay.hpp
rename to include/overlay.hpp
index 0b38da4..e11f1b8 100644
--- a/include/Overlay.hpp
+++ b/include/overlay.hpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-/// \file Overlay.hpp
+/// \file overlay.hpp
 
 #pragma once
 #include <nlohmann/json.hpp>
diff --git a/include/Utils.hpp b/include/utils.hpp
similarity index 99%
rename from include/Utils.hpp
rename to include/utils.hpp
index c54559a..bc8ac1b 100644
--- a/include/Utils.hpp
+++ b/include/utils.hpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-/// \file Utils.hpp
+/// \file utils.hpp
 
 #pragma once
 
diff --git a/include/VariantVisitors.hpp b/include/variant_visitors.hpp
similarity index 97%
rename from include/VariantVisitors.hpp
rename to include/variant_visitors.hpp
index 771d7d1..87ae750 100644
--- a/include/VariantVisitors.hpp
+++ b/include/variant_visitors.hpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-/// \file VariantVisitors.hpp
+/// \file variant_visitors.hpp
 
 #pragma once
 #include <stdexcept>