diff --git a/experiments/test_exp_cdc.sh b/experiments/test_exp_cdc.sh
index 6634e26a98adb58e780a61da218f9819fe443fab..dace34c5800fe51617de6459203b232b2b854eee 100755
--- a/experiments/test_exp_cdc.sh
+++ b/experiments/test_exp_cdc.sh
@@ -42,7 +42,7 @@ if True:
 
   import json
   from graph_tools.misc import graph_to_gadget
-  from graph_tools.parameters import CircuitDoubleCover, UnderlayingGraph
+  from graph_tools.parameters import CircuitDoubleCover, UnderlyingGraph
   from sage.all import Graph
   from parmap import parmap
 
@@ -51,7 +51,7 @@ if True:
     gadget = graph_to_gadget(G)
     real = gadget.eval(CircuitDoubleCover)
     exp = 2**(G.num_verts() // 2) // 2
-    assert G.is_isomorphic(gadget.eval(UnderlayingGraph))
+    assert G.is_isomorphic(gadget.eval(UnderlyingGraph))
   
     j = {
       "graph": G.sparse6_string(),
diff --git a/graph_tools/misc.py b/graph_tools/misc.py
index 165ec7cc2421b88949642f9ad3b56cde115ea3bb..42d6c3c74a56f3bf43c17ef1a48ff8122068051c 100644
--- a/graph_tools/misc.py
+++ b/graph_tools/misc.py
@@ -23,12 +23,12 @@ def _init_():
 
     EXAMPLES:
     >>> from sage.all import *
-    >>> from .parameters import CircuitDoubleCover, UnderlayingGraph
+    >>> from .parameters import CircuitDoubleCover, UnderlyingGraph
     >>> P = graphs.PetersenGraph()
     >>> graph_to_gadget_naive(P).eval(CircuitDoubleCover)
     52
     >>> d = [ list(range(5)), list(range(5, 10)) ]
-    >>> P.is_isomorphic(graph_to_gadget_naive(P, d).eval(UnderlayingGraph))
+    >>> P.is_isomorphic(graph_to_gadget_naive(P, d).eval(UnderlyingGraph))
     True
     >>> graph_to_gadget_naive(P, d).eval(CircuitDoubleCover)
     52
@@ -94,12 +94,12 @@ def _init_():
 
     EXAMPLES:
     >>> from sage.all import *
-    >>> from .parameters import CircuitDoubleCover, UnderlayingGraph
+    >>> from .parameters import CircuitDoubleCover, UnderlyingGraph
     >>> P = graphs.PetersenGraph()
     >>> graph_to_gadget(P).eval(CircuitDoubleCover)
     52
     >>> d = [ list(range(5)), list(range(5, 10)) ]
-    >>> P.is_isomorphic(graph_to_gadget(P, d).eval(UnderlayingGraph))
+    >>> P.is_isomorphic(graph_to_gadget(P, d).eval(UnderlyingGraph))
     True
     >>> graph_to_gadget(P, d).eval(CircuitDoubleCover)
     52
diff --git a/graph_tools/parameters.py b/graph_tools/parameters.py
index b0349141a7bd99ef4c891617bdd37c6b4aa8eba2..5c781d6803f34fe8a154decdfbe996c133aa7256 100644
--- a/graph_tools/parameters.py
+++ b/graph_tools/parameters.py
@@ -2,7 +2,7 @@ def _init_():
   global \
     GroupFlow, \
     EdgeColoring, VertexColoring, \
-    UnderlayingGraph, VertexCount, \
+    UnderlyingGraph, VertexCount, \
     HamiltonianCycle, \
     CycleDoubleCover, CircuitDoubleCover
 
@@ -102,7 +102,7 @@ def _init_():
 
 
   @Singleton
-  class UnderlayingGraph(GraphParameterBase):
+  class UnderlyingGraph(GraphParameterBase):
     from sage.all import Graph
 
     CUBIC_VERTEX = [
@@ -146,7 +146,7 @@ def _init_():
   class VertexCount(GraphParameterBase):
     """Count vertices of gadget.
 
-    Same as `gadget.eval(UnderlayingGraph).num_verts()` but
+    Same as `gadget.eval(UnderlyingGraph).num_verts()` but
     also works for gadgets containing FREE_EDGE.
     """
     CUBIC_VERTEX = [ BV(None, 1) ]
diff --git a/graph_tools/tests.py b/graph_tools/tests.py
index eaa06a4c0ef56029b80a86174cb99b2320ae2a4a..98aa5b6f544858cf207c34f0729b86fcee995c62 100644
--- a/graph_tools/tests.py
+++ b/graph_tools/tests.py
@@ -3,7 +3,7 @@
 >>> from .all import *
 >>> from sage.all import *
 
->>> g2g = lambda gadget: gadget.eval(UnderlayingGraph)
+>>> g2g = lambda gadget: gadget.eval(UnderlyingGraph)
 >>> assert graphs.CompleteGraph(4).is_isomorphic(g2g(Necklace.graph(1)))
 >>> assert graphs.PetersenGraph().is_isomorphic(g2g(Petersen))
 >>> assert all( \