diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt
index 68d80c16..dc2a77da 100644
--- a/osquery/tables/CMakeLists.txt
+++ b/osquery/tables/CMakeLists.txt
@@ -12,7 +12,7 @@ if(APPLE)
     networking/routes.cpp
     networking/utils.cpp
     system/apps.cpp
-    system/cacerts.cpp
+    system/ca_certs.cpp
     system/firewall.cpp
     system/kextstat.cpp
     system/launchd.cpp
@@ -61,10 +61,10 @@ if(APPLE)
   TARGET_LINK_LIBRARIES(apps_tests osquery_tables)
   SET_TARGET_PROPERTIES(apps_tests PROPERTIES COMPILE_FLAGS "-std=c++11 -stdlib=libc++")
 
-  ADD_EXECUTABLE(cacerts_tests system/cacerts_tests.cpp)
-  TARGET_LINK_LIBRARIES(cacerts_tests gtest)
-  TARGET_LINK_LIBRARIES(cacerts_tests osquery_tables)
-  SET_TARGET_PROPERTIES(cacerts_tests PROPERTIES COMPILE_FLAGS "-std=c++11 -stdlib=libc++")
+  ADD_EXECUTABLE(ca_certs_tests system/ca_certs_tests.cpp)
+  TARGET_LINK_LIBRARIES(ca_certs_tests gtest)
+  TARGET_LINK_LIBRARIES(ca_certs_tests osquery_tables)
+  SET_TARGET_PROPERTIES(ca_certs_tests PROPERTIES COMPILE_FLAGS "-std=c++11 -stdlib=libc++")
 
   ADD_EXECUTABLE(firewall_tests system/firewall_tests.cpp)
   TARGET_LINK_LIBRARIES(firewall_tests gtest)
diff --git a/osquery/tables/specs/darwin/cacerts.table b/osquery/tables/specs/darwin/ca_certs.table
similarity index 84%
rename from osquery/tables/specs/darwin/cacerts.table
rename to osquery/tables/specs/darwin/ca_certs.table
index 354ef884..be9c7314 100644
--- a/osquery/tables/specs/darwin/cacerts.table
+++ b/osquery/tables/specs/darwin/ca_certs.table
@@ -1,4 +1,4 @@
-table_name("cacerts")
+table_name("ca_certs")
 schema([
     Column(name="common_name", type="std::string"),
     Column(name="not_valid_before", type="std::string"),
@@ -10,4 +10,4 @@ schema([
     Column(name="sha1", type="std::string"),
 
 ])
-implementation("osquery/tables/system/cacerts@genCerts")
+implementation("osquery/tables/system/ca_certs@genCerts")
diff --git a/osquery/tables/system/cacerts.cpp b/osquery/tables/system/ca_certs.cpp
similarity index 100%
rename from osquery/tables/system/cacerts.cpp
rename to osquery/tables/system/ca_certs.cpp
diff --git a/osquery/tables/system/cacerts_tests.cpp b/osquery/tables/system/ca_certs_tests.cpp
similarity index 100%
rename from osquery/tables/system/cacerts_tests.cpp
rename to osquery/tables/system/ca_certs_tests.cpp