diff --git a/.gitignore b/.gitignore
index 2dbb5afe8..61623d6b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,10 @@ _build/
 *.dir/
 phlex-src
 phlex-build/
+CMakeCache.txt
+CMakeFiles/
+_deps/
+_codeql_detected_source_root
 
 # CMake user-specific presets (not generated by Spack)
 CMakeUserPresets.json
diff --git a/phlex/core/framework_graph.cpp b/phlex/core/framework_graph.cpp
index aae1fe9e3..bf281e8df 100644
--- a/phlex/core/framework_graph.cpp
+++ b/phlex/core/framework_graph.cpp
@@ -157,18 +157,18 @@ namespace phlex::experimental {
   {
     assert(store);
     auto const new_depth = store->id()->depth();
-    while (not empty(levels_) and new_depth <= levels_.top().depth()) {
-      levels_.pop();
+    while (not empty(layers_) and new_depth <= layers_.top().depth()) {
+      layers_.pop();
       eoms_.pop();
     }
-    levels_.emplace(counters_, sender_, store);
+    layers_.emplace(counters_, sender_, store);
     return store;
   }
 
   void framework_graph::drain()
   {
-    while (not empty(levels_)) {
-      levels_.pop();
+    while (not empty(layers_)) {
+      layers_.pop();
       eoms_.pop();
     }
   }
diff --git a/phlex/core/framework_graph.hpp b/phlex/core/framework_graph.hpp
index fbfe367bf..29a41f799 100644
--- a/phlex/core/framework_graph.hpp
+++ b/phlex/core/framework_graph.hpp
@@ -146,7 +146,7 @@ namespace phlex::experimental {
     message_sender sender_{hierarchy_, multiplexer_, eoms_};
     std::queue<product_store_ptr> pending_stores_;
     flush_counters counters_;
-    std::stack<layer_sentry> levels_;
+    std::stack<layer_sentry> layers_;
     bool shutdown_{false};
   };
 }
diff --git a/phlex/model/data_cell_index.hpp b/phlex/model/data_cell_index.hpp
index f7338dfef..e80056973 100644
--- a/phlex/model/data_cell_index.hpp
+++ b/phlex/model/data_cell_index.hpp
@@ -1,5 +1,5 @@
-#ifndef PHLEX_MODEL_DATA_CELL_ID_HPP
-#define PHLEX_MODEL_DATA_CELL_ID_HPP
+#ifndef PHLEX_MODEL_DATA_CELL_INDEX_HPP
+#define PHLEX_MODEL_DATA_CELL_INDEX_HPP
 
 #include "phlex/model/fwd.hpp"
 
@@ -62,4 +62,4 @@ namespace std {
   };
 }
 
-#endif // PHLEX_MODEL_DATA_CELL_ID_HPP
+#endif // PHLEX_MODEL_DATA_CELL_INDEX_HPP