diff --git a/st2common/st2common/util/param.py b/st2common/st2common/util/param.py
index d2604d6a03..52e1f025fd 100644
--- a/st2common/st2common/util/param.py
+++ b/st2common/st2common/util/param.py
@@ -156,8 +156,8 @@ def _process_defaults(G, schemas):
     """
     for schema in schemas:
         for name, value in six.iteritems(schema):
-            absent = name not in G.node
-            is_none = G.node.get(name, {}).get("value") is None
+            absent = name not in G.nodes
+            is_none = G.nodes.get(name, {}).get("value") is None
             immutable = value.get("immutable", False)
             if absent or is_none or immutable:
                 _process(G, name, value.get("default"))
@@ -167,8 +167,8 @@ def _validate(G):
     """
     Validates dependency graph to ensure it has no missing or cyclic dependencies
     """
-    for name in G.nodes():
-        if "value" not in G.node[name] and "template" not in G.node[name]:
+    for name in G.nodes:
+        if "value" not in G.nodes[name] and "template" not in G.nodes[name]:
             msg = 'Dependency unsatisfied in variable "%s"' % name
             raise ParamException(msg)
 
@@ -232,7 +232,7 @@ def _resolve_dependencies(G):
     """
     context = {}
     for name in nx.topological_sort(G):
-        node = G.node[name]
+        node = G.nodes[name]
         try:
             context[name] = _render(node, context)
 
diff --git a/tools/st2-analyze-links.py b/tools/st2-analyze-links.py
index f66c158dea..cff9a263da 100644
--- a/tools/st2-analyze-links.py
+++ b/tools/st2-analyze-links.py
@@ -152,11 +152,11 @@ def generate_graph(self, rule_links, out_file):
             print(rule_link._source_action_ref)
             if rule_link._source_action_ref not in nodes:
                 nodes.add(rule_link._source_action_ref)
-                dot.node(rule_link._source_action_ref, rule_link._source_action_ref)
+                dot.add_node(rule_link._source_action_ref)
             if rule_link._dest_action_ref not in nodes:
                 nodes.add(rule_link._dest_action_ref)
-                dot.node(rule_link._dest_action_ref, rule_link._dest_action_ref)
-            dot.edge(
+                dot.add_node(rule_link._dest_action_ref)
+            dot.add_edge(
                 rule_link._source_action_ref,
                 rule_link._dest_action_ref,
                 constraint="true",
diff --git a/tools/visualize_action_chain.py b/tools/visualize_action_chain.py
index c6742c460d..53a23ab51b 100755
--- a/tools/visualize_action_chain.py
+++ b/tools/visualize_action_chain.py
@@ -71,7 +71,7 @@ def main(metadata_path, output_path, print_source=False):
     # Add all nodes
     node = chain_holder.get_next_node()
     while node:
-        dot.node(node.name, node.name)
+        dot.add_node(node.name)
         node = chain_holder.get_next_node(curr_node_name=node.name)
 
     # Add connections
@@ -89,7 +89,7 @@ def main(metadata_path, output_path, print_source=False):
 
         # Add success node (if any)
         if success_node:
-            dot.edge(
+            dot.add_edge(
                 previous_node.name,
                 success_node.name,
                 constraint="true",
@@ -102,7 +102,7 @@ def main(metadata_path, output_path, print_source=False):
 
         # Add failure node (if any)
         if failure_node:
-            dot.edge(
+            dot.add_edge(
                 previous_node.name,
                 failure_node.name,
                 constraint="true",