diff --git a/src/Makefile.am b/src/Makefile.am
index 1188fdf9..c926c7c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -207,23 +207,24 @@ OPERATORS = \
 	operators/verify_cpf.cc \
 	operators/verify_ssn.cc \
 	operators/within.cc \
- 	operators/unconditional_match.cc
+	operators/unconditional_match.cc
 
 
 UTILS = \
-	utils/acmp.cc \
-	utils/base64.cc \
-	utils/decode.cc \
-	utils/geo_lookup.cc \
-	utils/https_client.cc \
-	utils/ip_tree.cc \
-	utils/md5.cc \
-	utils/msc_tree.cc \
-	utils/random.cc \
-	utils/regex.cc \
-	utils/sha1.cc \
-	utils/msc_string.cc \
-	utils/msc_system.cc
+        utils/acmp.cc \
+        utils/base64.cc \
+        utils/decode.cc \
+        utils/geo_lookup.cc \
+        utils/https_client.cc \
+        utils/ip_tree.cc \
+        utils/md5.cc \
+        utils/msc_string.cc \
+        utils/msc_tree.cc \
+        utils/random.cc \
+        utils/regex.cc \
+        utils/sha1.cc \
+        utils/system.cc
+
 
 COLLECTION = \
 	collection/collections.cc \
diff --git a/src/audit_log/writer/parallel.cc b/src/audit_log/writer/parallel.cc
index e8343bcd..ac09176c 100644
--- a/src/audit_log/writer/parallel.cc
+++ b/src/audit_log/writer/parallel.cc
@@ -27,7 +27,7 @@
 
 #include "src/audit_log/audit_log.h"
 #include "modsecurity/transaction.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 #include "src/utils/md5.h"
 
 
diff --git a/src/operators/pm_from_file.cc b/src/operators/pm_from_file.cc
index 248b110d..a82bb4e1 100644
--- a/src/operators/pm_from_file.cc
+++ b/src/operators/pm_from_file.cc
@@ -19,7 +19,7 @@
 
 #include "src/operators/operator.h"
 #include "src/utils/https_client.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 
 
 namespace modsecurity {
diff --git a/src/operators/validate_dtd.cc b/src/operators/validate_dtd.cc
index d5d1f1dd..3491f1be 100644
--- a/src/operators/validate_dtd.cc
+++ b/src/operators/validate_dtd.cc
@@ -18,7 +18,7 @@
 #include <string>
 
 #include "src/request_body_processor/xml.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 #include "src/operators/operator.h"
 
 namespace modsecurity {
diff --git a/src/operators/validate_schema.cc b/src/operators/validate_schema.cc
index 4fb4fabd..2c559828 100644
--- a/src/operators/validate_schema.cc
+++ b/src/operators/validate_schema.cc
@@ -19,7 +19,7 @@
 
 #include "src/operators/operator.h"
 #include "src/request_body_processor/xml.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 
 
 namespace modsecurity {
diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy
index 0827ffc1..d903ed43 100644
--- a/src/parser/seclang-parser.yy
+++ b/src/parser/seclang-parser.yy
@@ -56,7 +56,7 @@ class Driver;
 #include "src/operators/operator.h"
 #include "src/utils/geo_lookup.h"
 #include "src/utils/msc_string.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 #include "src/variables/xml.h"
 #include "src/variables/duration.h"
 #include "src/variables/env.h"
diff --git a/src/transaction.cc b/src/transaction.cc
index c7858719..6da0445b 100644
--- a/src/transaction.cc
+++ b/src/transaction.cc
@@ -42,7 +42,7 @@
 #include "src/audit_log/audit_log.h"
 #include "src/unique_id.h"
 #include "src/utils/msc_string.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 #include "src/utils/decode.h"
 #include "src/utils/random.h"
 #include "modsecurity/rule.h"
diff --git a/src/utils/msc_system.cc b/src/utils/system.cc
similarity index 98%
rename from src/utils/msc_system.cc
rename to src/utils/system.cc
index f7dd2e8b..02bcd264 100644
--- a/src/utils/msc_system.cc
+++ b/src/utils/system.cc
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #endif
 
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 
 namespace modsecurity {
 namespace utils {
diff --git a/src/utils/msc_system.h b/src/utils/system.h
similarity index 90%
rename from src/utils/msc_system.h
rename to src/utils/system.h
index 3938adc1..75fce10a 100644
--- a/src/utils/msc_system.h
+++ b/src/utils/system.h
@@ -20,8 +20,8 @@
 
 #include "modsecurity/modsecurity.h"
 
-#ifndef SRC_UTILS_MSC_SYSTEM_H_
-#define SRC_UTILS_MSC_SYSTEM_H_
+#ifndef SRC_UTILS_SYSTEM_H_
+#define SRC_UTILS_SYSTEM_H_
 
 
 namespace modsecurity {
@@ -38,4 +38,4 @@ void createDir(std::string dir, int mode);
 }  // namespace utils
 }  // namespace modsecurity
 
-#endif  // SRC_UTILS_MSC_SYSTEM_H_
+#endif  // SRC_UTILS_SYSTEM_H_
diff --git a/src/variables/duration.cc b/src/variables/duration.cc
index eefdacfc..eb7028ab 100644
--- a/src/variables/duration.cc
+++ b/src/variables/duration.cc
@@ -22,7 +22,7 @@
 #include <utility>
 
 #include "modsecurity/transaction.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 
 namespace modsecurity {
 namespace Variables {
diff --git a/test/optimization/optimization.cc b/test/optimization/optimization.cc
index 9b88df3f..6d5860bc 100644
--- a/test/optimization/optimization.cc
+++ b/test/optimization/optimization.cc
@@ -22,7 +22,7 @@
 
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/rules.h"
-#include "src/utils/msc_system.h"
+#include "src/utils/system.h"
 #include "src/parser/driver.h"
 #include "src/utils/https_client.h"
 #include "modsecurity/rules_properties.h"