diff --git a/nullability_verification/pointer_nullability_analysis.h b/nullability_verification/pointer_nullability_analysis.h
index 3ff9ac0..4515091 100644
--- a/nullability_verification/pointer_nullability_analysis.h
+++ b/nullability_verification/pointer_nullability_analysis.h
@@ -5,12 +5,12 @@
 #ifndef CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_ANALYSIS_H_
 #define CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_ANALYSIS_H_
 
+#include "nullability_verification/pointer_nullability_lattice.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Type.h"
 #include "clang/Analysis/FlowSensitive/CFGMatchSwitch.h"
 #include "clang/Analysis/FlowSensitive/DataflowAnalysis.h"
 #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
-#include "clang/Analysis/FlowSensitive/NoopLattice.h"
 #include "clang/Analysis/FlowSensitive/Value.h"
 
 namespace clang {
@@ -21,13 +21,13 @@
 /// about pointers at each program point.
 class PointerNullabilityAnalysis
     : public dataflow::DataflowAnalysis<PointerNullabilityAnalysis,
-                                        dataflow::NoopLattice> {
+                                        PointerNullabilityLattice> {
  public:
   explicit PointerNullabilityAnalysis(ASTContext& context);
 
-  static dataflow::NoopLattice initialElement() { return {}; }
+  static PointerNullabilityLattice initialElement() { return {}; }
 
-  void transfer(const CFGElement* Elt, dataflow::NoopLattice& Lattice,
+  void transfer(const CFGElement* Elt, PointerNullabilityLattice& Lattice,
                 dataflow::Environment& Env);
 
   bool merge(QualType Type, const dataflow::Value& Val1,
@@ -37,7 +37,7 @@
 
  private:
   // Applies transfer functions on statements
-  dataflow::CFGMatchSwitch<dataflow::TransferState<dataflow::NoopLattice>>
+  dataflow::CFGMatchSwitch<dataflow::TransferState<PointerNullabilityLattice>>
       Transferer;
 };
 }  // namespace nullability