diff --git a/src/isolator/hei_isolation_node.cpp b/src/isolator/hei_isolation_node.cpp
index e2bf61a..f5c58db 100644
--- a/src/isolator/hei_isolation_node.cpp
+++ b/src/isolator/hei_isolation_node.cpp
@@ -21,10 +21,10 @@
     const BitString* bs = rule_itr->second->getBitString(i_chip);
 
     // Ensure this BitString is not longer than the maximum bit field.
-    HEI_ASSERT(bs->getBitLen() <= (1 << (sizeof(RegisterBit_t) * 8)));
+    HEI_ASSERT(bs->getBitLen() <= (1 << (sizeof(BitPosition_t) * 8)));
 
     // Find all active bits for this rule.
-    for (RegisterBit_t bit = 0; bit < bs->getBitLen(); bit++)
+    for (BitPosition_t bit = 0; bit < bs->getBitLen(); bit++)
     {
         // Continue to the next bit if not active.
         if (!bs->isBitSet(bit))
diff --git a/src/isolator/hei_isolation_node.hpp b/src/isolator/hei_isolation_node.hpp
index eedde91..782ac7f 100644
--- a/src/isolator/hei_isolation_node.hpp
+++ b/src/isolator/hei_isolation_node.hpp
@@ -89,7 +89,7 @@
      * Each bit (key) in this map indicates that an attention was driven from
      * another register (value).
      */
-    std::map<RegisterBit_t, const IsolationNode*> iv_children;
+    std::map<BitPosition_t, const IsolationNode*> iv_children;
 
   public: // Member functions
     /**
@@ -136,7 +136,7 @@
      * @param The target bit on this register.
      * @param The child register to analyze for the given bit.
      */
-    void addChild(RegisterBit_t i_bit, const IsolationNode* i_child);
+    void addChild(BitPosition_t i_bit, const IsolationNode* i_child);
 
   public: // Operators
     /** @brief Equals operator. */