@@ -94,16 +94,17 @@ type GraphDescriber interface {

 }

 type Interface interface {

-	graph.DirectedGraph

-	graph.EdgeLister

+	graph.Directed

 	GraphDescriber

 	MutableUniqueGraph

+

+	Edges() []graph.Edge

 }

 type Graph struct {

 	// the standard graph

-	graph.DirectedGraph

+	graph.Directed

 	// helper methods for switching on the kind and types of the node

 	GraphDescriber

@@ -120,7 +121,7 @@ var _ MutableUniqueGraph = Graph{}

 func New() Graph {

 	g := concrete.NewDirectedGraph()

 	return Graph{

-		DirectedGraph:  g,

+		Directed:       g,

 		GraphDescriber: typedGraph{},

 		uniqueNamedGraph: newUniqueNamedGraph(g),

@@ -129,19 +130,23 @@ func New() Graph {

 	}

 }

+func (g Graph) Edges() []graph.Edge {

+	return g.internal.Edges()

+}

+

 func (g Graph) String() string {

 	ret := ""

-	nodeList := g.NodeList()

-	sort.Sort(SortedNodeList(nodeList))

-	for _, node := range nodeList {

+	nodes := g.Nodes()

+	sort.Sort(SortedNodes(nodes))

+	for _, node := range nodes {

 		ret += fmt.Sprintf("%d: %v\n", node.ID(), g.GraphDescriber.Name(node))

 		// can't use SuccessorEdges, because I want stable ordering

-		successors := g.Successors(node)

-		sort.Sort(SortedNodeList(successors))

+		successors := g.From(node)

+		sort.Sort(SortedNodes(successors))

 		for _, successor := range successors {

-			edge := g.EdgeBetween(node, successor)

+			edge := g.Edge(node, successor)

 			kinds := g.EdgeKinds(edge)

 			for _, kind := range kinds.List() {

 				ret += fmt.Sprintf("\t%v to %d: %v\n", kind, successor.ID(), g.GraphDescriber.Name(successor))

@@ -152,11 +157,11 @@ func (g Graph) String() string {

 	return ret

 }

-type SortedNodeList []graph.Node

+type SortedNodes []graph.Node

-func (m SortedNodeList) Len() int      { return len(m) }

-func (m SortedNodeList) Swap(i, j int) { m[i], m[j] = m[j], m[i] }

-func (m SortedNodeList) Less(i, j int) bool {

+func (m SortedNodes) Len() int      { return len(m) }

+func (m SortedNodes) Swap(i, j int) { m[i], m[j] = m[j], m[i] }

+func (m SortedNodes) Less(i, j int) bool {

 	return m[i].ID() < m[j].ID()

 }

@@ -164,9 +169,9 @@ func (m SortedNodeList) Less(i, j int) bool {

 func (g Graph) SyntheticNodes() []graph.Node {

 	ret := []graph.Node{}

-	nodeList := g.NodeList()

-	sort.Sort(SortedNodeList(nodeList))

-	for _, node := range nodeList {

+	nodes := g.Nodes()

+	sort.Sort(SortedNodes(nodes))

+	for _, node := range nodes {

 		if potentiallySyntheticNode, ok := node.(ExistenceChecker); ok {

 			if !potentiallySyntheticNode.Found() {

 				ret = append(ret, node)

@@ -181,7 +186,7 @@ func (g Graph) NodesByKind(nodeKinds ...string) []graph.Node {

 	ret := []graph.Node{}

 	kinds := util.NewStringSet(nodeKinds...)

-	for _, node := range g.NodeList() {

+	for _, node := range g.internal.Nodes() {

 		if kinds.Has(g.Kind(node)) {

 			ret = append(ret, node)

 		}

@@ -193,8 +198,8 @@ func (g Graph) NodesByKind(nodeKinds ...string) []graph.Node {

 // RootNodes returns all the roots of this graph.

 func (g Graph) RootNodes() []graph.Node {

 	roots := []graph.Node{}

-	for _, n := range g.internal.NodeList() {

-		if len(g.internal.Predecessors(n)) != 0 {

+	for _, n := range g.Nodes() {

+		if len(g.To(n)) != 0 {

 			continue

 		}

 		roots = append(roots, n)

@@ -205,8 +210,8 @@ func (g Graph) RootNodes() []graph.Node {

 // PredecessorEdges invokes fn with all of the predecessor edges of node that have the specified

 // edge kind.

 func (g Graph) PredecessorEdges(node graph.Node, fn EdgeFunc, edgeKinds ...string) {

-	for _, n := range g.Predecessors(node) {

-		edge := g.EdgeBetween(n, node)

+	for _, n := range g.To(node) {

+		edge := g.Edge(n, node)

 		kinds := g.EdgeKinds(edge)

 		if kinds.HasAny(edgeKinds...) {

@@ -218,8 +223,8 @@ func (g Graph) PredecessorEdges(node graph.Node, fn EdgeFunc, edgeKinds ...strin

 // SuccessorEdges invokes fn with all of the successor edges of node that have the specified

 // edge kind.

 func (g Graph) SuccessorEdges(node graph.Node, fn EdgeFunc, edgeKinds ...string) {

-	for _, n := range g.Successors(node) {

-		edge := g.EdgeBetween(node, n)

+	for _, n := range g.From(node) {

+		edge := g.Edge(node, n)

 		kinds := g.EdgeKinds(edge)

 		if kinds.HasAny(edgeKinds...) {

@@ -233,8 +238,12 @@ func (g Graph) SuccessorEdges(node graph.Node, fn EdgeFunc, edgeKinds ...string)

 func (g Graph) OutboundEdges(node graph.Node, edgeKinds ...string) []graph.Edge {

 	ret := []graph.Edge{}

-	for _, n := range g.Successors(node) {

-		edge := g.EdgeBetween(n, node)

+	for _, n := range g.From(node) {

+		edge := g.Edge(node, n)

+		if edge == nil {

+			continue

+		}

+

 		if len(edgeKinds) == 0 || g.EdgeKinds(edge).HasAny(edgeKinds...) {

 			ret = append(ret, edge)

 		}

@@ -248,8 +257,12 @@ func (g Graph) OutboundEdges(node graph.Node, edgeKinds ...string) []graph.Edge

 func (g Graph) InboundEdges(node graph.Node, edgeKinds ...string) []graph.Edge {

 	ret := []graph.Edge{}

-	for _, n := range g.Predecessors(node) {

-		edge := g.EdgeBetween(n, node)

+	for _, n := range g.To(node) {

+		edge := g.Edge(n, node)

+		if edge == nil {

+			continue

+		}

+

 		if len(edgeKinds) == 0 || g.EdgeKinds(edge).HasAny(edgeKinds...) {

 			ret = append(ret, edge)

 		}

@@ -262,7 +275,7 @@ func (g Graph) PredecessorNodesByEdgeKind(node graph.Node, edgeKinds ...string)

 	ret := []graph.Node{}

 	for _, inboundEdges := range g.InboundEdges(node, edgeKinds...) {

-		ret = append(ret, inboundEdges.Head())

+		ret = append(ret, inboundEdges.From())

 	}

 	return ret

@@ -272,7 +285,7 @@ func (g Graph) SuccessorNodesByEdgeKind(node graph.Node, edgeKinds ...string) []

 	ret := []graph.Node{}

 	for _, outboundEdge := range g.OutboundEdges(node, edgeKinds...) {

-		ret = append(ret, outboundEdge.Tail())

+		ret = append(ret, outboundEdge.To())

 	}

 	return ret

@@ -292,10 +305,6 @@ func (g Graph) SuccessorNodesByNodeAndEdgeKind(node graph.Node, nodeKind, edgeKi

 	return ret

 }

-func (g Graph) EdgeList() []graph.Edge {

-	return g.internal.EdgeList()

-}

-

 func (g Graph) AddNode(n graph.Node) {

 	g.internal.AddNode(n)

 }

@@ -314,11 +323,11 @@ func (g Graph) AddEdge(head, tail graph.Node, edgeKind string) {

 	}

 	kinds := util.NewStringSet(edgeKind)

-	if existingEdge := g.EdgeBetween(head, tail); existingEdge != nil {

+	if existingEdge := g.Edge(head, tail); existingEdge != nil {

 		kinds.Insert(g.EdgeKinds(existingEdge).List()...)

 	}

-	g.internal.AddDirectedEdge(NewEdge(head, tail, kinds.List()...), 1)

+	g.internal.SetEdge(NewEdge(head, tail, kinds.List()...), 1)

 }

 // addEdges adds the specified edges, filtered by the provided edge connection

@@ -327,12 +336,12 @@ func (g Graph) addEdges(edges []graph.Edge, fn EdgeFunc) {

 	for _, e := range edges {

 		switch t := e.(type) {

 		case concrete.WeightedEdge:

-			if fn(g, t.Head(), t.Tail(), t.Edge.(Edge).Kinds()) {

-				g.internal.AddDirectedEdge(t.Edge.(Edge), t.Cost)

+			if fn(g, t.From(), t.To(), t.Edge.(Edge).Kinds()) {

+				g.internal.SetEdge(t.Edge.(Edge), t.Cost)

 			}

 		case Edge:

-			if fn(g, t.Head(), t.Tail(), t.Kinds()) {

-				g.internal.AddDirectedEdge(t, 1.0)

+			if fn(g, t.From(), t.To(), t.Kinds()) {

+				g.internal.SetEdge(t, 1.0)

 			}

 		default:

 			panic("bad edge")

@@ -352,10 +361,10 @@ type EdgeFunc func(g Interface, head, tail graph.Node, edgeKinds util.StringSet)

 // provided function.

 func (g Graph) EdgeSubgraph(edgeFn EdgeFunc) Graph {

 	out := New()

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		out.internal.AddNode(node)

 	}

-	out.addEdges(g.internal.EdgeList(), edgeFn)

+	out.addEdges(g.internal.Edges(), edgeFn)

 	return out

 }

@@ -363,12 +372,12 @@ func (g Graph) EdgeSubgraph(edgeFn EdgeFunc) Graph {

 // provided functions.

 func (g Graph) Subgraph(nodeFn NodeFunc, edgeFn EdgeFunc) Graph {

 	out := New()

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		if nodeFn(out, node) {

 			out.internal.AddNode(node)

 		}

 	}

-	out.addEdges(g.internal.EdgeList(), edgeFn)

+	out.addEdges(g.internal.Edges(), edgeFn)

 	return out

 }

@@ -379,7 +388,7 @@ func (g Graph) SubgraphWithNodes(nodes []graph.Node, fn EdgeFunc) Graph {

 	for _, node := range nodes {

 		out.internal.AddNode(node)

 	}

-	out.addEdges(g.internal.EdgeList(), fn)

+	out.addEdges(g.internal.Edges(), fn)

 	return out

 }

@@ -388,7 +397,7 @@ func (g Graph) SubgraphWithNodes(nodes []graph.Node, fn EdgeFunc) Graph {

 // an edge will be dropped unless the function adds them explicitly.

 func (g Graph) ConnectedEdgeSubgraph(fn EdgeFunc) Graph {

 	out := New()

-	out.addEdges(g.internal.EdgeList(), fn)

+	out.addEdges(g.internal.Edges(), fn)

 	return out

 }

@@ -401,7 +410,7 @@ func AllNodes(g Interface, node graph.Node) bool {

 // not ReferencedByEdgeKind (the generic reverse edge kind). This will purge the graph of any

 // edges created by AddReversedEdge.

 func ExistingDirectEdge(g Interface, head, tail graph.Node, edgeKinds util.StringSet) bool {

-	return !edgeKinds.Has(ReferencedByEdgeKind) && g.NodeExists(head) && g.NodeExists(tail)

+	return !edgeKinds.Has(ReferencedByEdgeKind) && g.Has(head) && g.Has(tail)

 }

 // ReverseExistingDirectEdge reverses the order of the edge and drops the existing edge only if

@@ -455,7 +464,7 @@ func (g uniqueNamedGraph) FindOrCreate(name UniqueName, fn NodeInitializerFunc)

 	if node, ok := g.names[name]; ok {

 		return node, true

 	}

-	id := g.NewNode().ID()

+	id := g.NewNodeID()

 	node := fn(Node{concrete.Node(id), name})

 	g.names[name] = node

 	g.AddNode(node)

@@ -540,7 +549,7 @@ func NodesByKind(g Interface, nodes []graph.Node, kinds ...string) [][]graph.Nod

 		buckets[kind] = i

 	}

 	if nodes == nil {

-		nodes = g.NodeList()

+		nodes = g.Nodes()

 	}

 	last := len(kinds)

@@ -578,12 +587,12 @@ func pathEqual(a, b []graph.Node) bool {

 }

 func Fprint(out io.Writer, g Graph) {

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		fmt.Fprintf(out, "node %d %s\n", node.ID(), node)

 	}

-	for _, edge := range g.EdgeList() {

+	for _, edge := range g.Edges() {

 		for _, edgeKind := range g.EdgeKinds(edge).List() {

-			fmt.Fprintf(out, "edge %d -> %d : %d\n", edge.Head().ID(), edge.Head().ID(), edgeKind)

+			fmt.Fprintf(out, "edge %d -> %d : %d\n", edge.From().ID(), edge.From().ID(), edgeKind)

 		}

 	}

 }

@@ -13,7 +13,7 @@ func TestMultipleEdgeKindsBetweenTheSameNodes(t *testing.T) {

 	g.AddEdge(fooNode, barNode, "first")

 	g.AddEdge(fooNode, barNode, "second")

-	edge := g.EdgeBetween(fooNode, barNode)

+	edge := g.Edge(fooNode, barNode)

 	if !g.EdgeKinds(edge).Has("first") {

 		t.Errorf("expected first, got %v", edge)

 	}

@@ -330,7 +330,7 @@ func TestGraph(t *testing.T) {

 	t.Log(g)

-	for _, edge := range g.EdgeList() {

+	for _, edge := range g.Edges() {

 		if g.EdgeKinds(edge).Has(osgraph.UnknownEdgeKind) {

 			t.Errorf("edge reported unknown kind: %#v", edge)

 		}

@@ -338,28 +338,25 @@ func TestGraph(t *testing.T) {

 	// imagestreamtag default/other:base-image

 	istID := 0

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		if g.Name(node) == "ImageStreamTag|default/other:base-image" {

 			istID = node.ID()

 			break

 		}

 	}

-	edge := g.EdgeBetween(concrete.Node(bcTestNode.ID()), concrete.Node(istID))

+	edge := g.Edge(concrete.Node(bcTestNode.ID()), concrete.Node(istID))

 	if edge == nil {

 		t.Fatalf("failed to find edge between %d and %d", bcTestNode.ID(), istID)

 	}

-	if len(g.SubgraphWithNodes([]graph.Node{edge.Head(), edge.Tail()}, osgraph.ExistingDirectEdge).EdgeList()) != 1 {

+	if len(g.SubgraphWithNodes([]graph.Node{edge.From(), edge.To()}, osgraph.ExistingDirectEdge).Edges()) != 1 {

 		t.Fatalf("expected one edge")

 	}

-	if len(g.SubgraphWithNodes([]graph.Node{edge.Tail(), edge.Head()}, osgraph.ExistingDirectEdge).EdgeList()) != 1 {

+	if len(g.SubgraphWithNodes([]graph.Node{edge.To(), edge.From()}, osgraph.ExistingDirectEdge).Edges()) != 1 {

 		t.Fatalf("expected one edge")

 	}

-	if e := g.EdgeBetween(concrete.Node(bcTestNode.ID()), concrete.Node(istID)); e == nil {

-		t.Errorf("expected edge for %d-%d", bcTestNode.ID(), istID)

-	}

-	if e := g.EdgeBetween(concrete.Node(istID), concrete.Node(bcTestNode.ID())); e == nil {

+	if e := g.Edge(concrete.Node(bcTestNode.ID()), concrete.Node(istID)); e == nil {

 		t.Errorf("expected edge for %d-%d", bcTestNode.ID(), istID)

 	}

@@ -61,8 +61,8 @@ func GetTopLevelContainerNode(g Graph, containedNode graph.Node) graph.Node {

 // GetContainingNode returns the direct predecessor that is linked to the node by a ContainsEdgeKind.  It returns

 // nil if no container is found.

 func GetContainingNode(g Graph, containedNode graph.Node) graph.Node {

-	for _, node := range g.Predecessors(containedNode) {

-		edge := g.EdgeBetween(node, containedNode)

+	for _, node := range g.To(containedNode) {

+		edge := g.Edge(node, containedNode)

 		if g.EdgeKinds(edge).Has(ContainsEdgeKind) {

 			return node

@@ -41,6 +41,10 @@ func TestContainsNavigation(t *testing.T) {

 	}

 	containsB := GetContainingNode(g, bNode)

+	if containsB == nil {

+		t.Fatal(g)

+	}

+

 	if e, a := aNode.ID(), containsB.ID(); e != a {

 		t.Errorf("expected %v, got %v", e, a)

 	}

@@ -32,7 +32,7 @@ func TestSecretEdges(t *testing.T) {

 	AddAllMountableSecretEdges(g)

 	AddAllMountedSecretEdges(g)

-	if edge := g.EdgeBetween(saNode, secretNode); edge == nil {

+	if edge := g.Edge(saNode, secretNode); edge == nil {

 		t.Errorf("edge missing")

 	} else {

 		if !g.EdgeKinds(edge).Has(MountableSecretEdgeKind) {

@@ -45,7 +45,7 @@ func TestSecretEdges(t *testing.T) {

 		t.Fatalf("wrong number of podspecs: %v", podSpecNodes)

 	}

-	if edge := g.EdgeBetween(podSpecNodes[0], secretNode); edge == nil {

+	if edge := g.Edge(podSpecNodes[0], secretNode); edge == nil {

 		t.Errorf("edge missing")

 	} else {

 		if !g.EdgeKinds(edge).Has(MountedSecretEdgeKind) {

@@ -31,7 +31,7 @@ func AddExposedPodTemplateSpecEdges(g osgraph.MutableUniqueGraph, node *kubegrap

 		return

 	}

 	query := labels.SelectorFromSet(node.Service.Spec.Selector)

-	for _, n := range g.(graph.Graph).NodeList() {

+	for _, n := range g.(graph.Graph).Nodes() {

 		switch target := n.(type) {

 		case *kubegraph.PodTemplateSpecNode:

 			if query.Matches(labels.Set(target.PodTemplateSpec.Labels)) {

@@ -43,7 +43,7 @@ func AddExposedPodTemplateSpecEdges(g osgraph.MutableUniqueGraph, node *kubegrap

 // AddAllExposedPodTemplateSpecEdges calls AddExposedPodTemplateSpecEdges for every ServiceNode in the graph

 func AddAllExposedPodTemplateSpecEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if serviceNode, ok := node.(*kubegraph.ServiceNode); ok {

 			AddExposedPodTemplateSpecEdges(g, serviceNode)

 		}

@@ -57,7 +57,7 @@ func AddExposedPodEdges(g osgraph.MutableUniqueGraph, node *kubegraph.ServiceNod

 		return

 	}

 	query := labels.SelectorFromSet(node.Service.Spec.Selector)

-	for _, n := range g.(graph.Graph).NodeList() {

+	for _, n := range g.(graph.Graph).Nodes() {

 		switch target := n.(type) {

 		case *kubegraph.PodNode:

 			if query.Matches(labels.Set(target.Labels)) {

@@ -69,7 +69,7 @@ func AddExposedPodEdges(g osgraph.MutableUniqueGraph, node *kubegraph.ServiceNod

 // AddAllExposedPodEdges calls AddExposedPodEdges for every ServiceNode in the graph

 func AddAllExposedPodEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if serviceNode, ok := node.(*kubegraph.ServiceNode); ok {

 			AddExposedPodEdges(g, serviceNode)

 		}

@@ -83,7 +83,7 @@ func AddManagedByRCPodEdges(g osgraph.MutableUniqueGraph, rcNode *kubegraph.Repl

 		return

 	}

 	query := labels.SelectorFromSet(rcNode.Spec.Selector)

-	for _, n := range g.(graph.Graph).NodeList() {

+	for _, n := range g.(graph.Graph).Nodes() {

 		switch target := n.(type) {

 		case *kubegraph.PodNode:

 			if query.Matches(labels.Set(target.Labels)) {

@@ -95,7 +95,7 @@ func AddManagedByRCPodEdges(g osgraph.MutableUniqueGraph, rcNode *kubegraph.Repl

 // AddAllManagedByRCPodEdges calls AddManagedByRCPodEdges for every ServiceNode in the graph

 func AddAllManagedByRCPodEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if rcNode, ok := node.(*kubegraph.ReplicationControllerNode); ok {

 			AddManagedByRCPodEdges(g, rcNode)

 		}

@@ -130,7 +130,7 @@ func AddMountedSecretEdges(g osgraph.Graph, podSpec *kubegraph.PodSpecNode) {

 }

 func AddAllMountedSecretEdges(g osgraph.Graph) {

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		if podSpecNode, ok := node.(*kubegraph.PodSpecNode); ok {

 			AddMountedSecretEdges(g, podSpecNode)

 		}

@@ -149,7 +149,7 @@ func AddMountableSecretEdges(g osgraph.Graph, saNode *kubegraph.ServiceAccountNo

 }

 func AddAllMountableSecretEdges(g osgraph.Graph) {

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		if saNode, ok := node.(*kubegraph.ServiceAccountNode); ok {

 			AddMountableSecretEdges(g, saNode)

 		}

@@ -181,7 +181,7 @@ func AddRequestedServiceAccountEdges(g osgraph.Graph, podSpecNode *kubegraph.Pod

 }

 func AddAllRequestedServiceAccountEdges(g osgraph.Graph) {

-	for _, node := range g.NodeList() {

+	for _, node := range g.Nodes() {

 		if podSpecNode, ok := node.(*kubegraph.PodSpecNode); ok {

 			AddRequestedServiceAccountEdges(g, podSpecNode)

 		}

@@ -18,20 +18,20 @@ func TestPodSpecNode(t *testing.T) {

 	podNode := EnsurePodNode(g, pod)

-	if len(g.NodeList()) != 2 {

-		t.Errorf("expected 2 nodes, got %v", g.NodeList())

+	if len(g.Nodes()) != 2 {

+		t.Errorf("expected 2 nodes, got %v", g.Nodes())

 	}

-	if len(g.EdgeList()) != 1 {

-		t.Errorf("expected 1 edge, got %v", g.EdgeList())

+	if len(g.Edges()) != 1 {

+		t.Errorf("expected 1 edge, got %v", g.Edges())

 	}

-	edge := g.EdgeList()[0]

+	edge := g.Edges()[0]

 	if !g.EdgeKinds(edge).Has(osgraph.ContainsEdgeKind) {

 		t.Errorf("expected %v, got %v", osgraph.ContainsEdgeKind, g.EdgeKinds(edge))

 	}

-	if edge.Head().ID() != podNode.ID() {

-		t.Errorf("expected %v, got %v", podNode.ID(), edge.Head())

+	if edge.From().ID() != podNode.ID() {

+		t.Errorf("expected %v, got %v", podNode.ID(), edge.From())

 	}

 }

@@ -45,23 +45,23 @@ func TestReplicationControllerSpecNode(t *testing.T) {

 	rcNode := EnsureReplicationControllerNode(g, rc)

-	if len(g.NodeList()) != 4 {

-		t.Errorf("expected 4 nodes, got %v", g.NodeList())

+	if len(g.Nodes()) != 4 {

+		t.Errorf("expected 4 nodes, got %v", g.Nodes())

 	}

-	if len(g.EdgeList()) != 3 {

-		t.Errorf("expected 3 edge, got %v", g.EdgeList())

+	if len(g.Edges()) != 3 {

+		t.Errorf("expected 3 edge, got %v", g.Edges())

 	}

 	rcEdges := g.OutboundEdges(rcNode)

 	if len(rcEdges) != 1 {

-		t.Fatalf("expected 1 edge, got %v", rcEdges)

+		t.Fatalf("expected 1 edge, got %v for \n%v", rcEdges, g)

 	}

 	if !g.EdgeKinds(rcEdges[0]).Has(osgraph.ContainsEdgeKind) {

 		t.Errorf("expected %v, got %v", osgraph.ContainsEdgeKind, rcEdges[0])

 	}

-	uncastRCSpec := rcEdges[0].Tail()

+	uncastRCSpec := rcEdges[0].To()

 	rcSpec, ok := uncastRCSpec.(*ReplicationControllerSpecNode)

 	if !ok {

 		t.Fatalf("expected rcSpec, got %v", uncastRCSpec)

@@ -74,7 +74,7 @@ func TestReplicationControllerSpecNode(t *testing.T) {

 		t.Errorf("expected %v, got %v", osgraph.ContainsEdgeKind, rcSpecEdges[0])

 	}

-	uncastPTSpec := rcSpecEdges[0].Tail()

+	uncastPTSpec := rcSpecEdges[0].To()

 	ptSpec, ok := uncastPTSpec.(*PodTemplateSpecNode)

 	if !ok {

 		t.Fatalf("expected ptspec, got %v", uncastPTSpec)

@@ -20,7 +20,7 @@ const (

 )

 func AddBuildEdges(g osgraph.MutableUniqueGraph, node *buildgraph.BuildConfigNode) {

-	for _, n := range g.(graph.Graph).NodeList() {

+	for _, n := range g.(graph.Graph).Nodes() {

 		if buildNode, ok := n.(*buildgraph.BuildNode); ok {

 			if belongsToBuildConfig(node.BuildConfig, buildNode.Build) {

 				g.AddEdge(node, buildNode, BuildEdgeKind)

@@ -30,7 +30,7 @@ func AddBuildEdges(g osgraph.MutableUniqueGraph, node *buildgraph.BuildConfigNod

 }

 func AddAllBuildEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if bcNode, ok := node.(*buildgraph.BuildConfigNode); ok {

 			AddBuildEdges(g, bcNode)

 		}

@@ -80,7 +80,7 @@ func AddInputOutputEdges(g osgraph.MutableUniqueGraph, node *buildgraph.BuildCon

 }

 func AddAllInputOutputEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if bcNode, ok := node.(*buildgraph.BuildConfigNode); ok {

 			AddInputOutputEdges(g, bcNode)

 		}

@@ -133,7 +133,7 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error

 			for _, podNode := range service.FulfillingPods {

 				// skip pods that have been displayed in a roll-up of RCs and DCs (by implicit usage of RCs)

 				for _, coveredRC := range service.FulfillingRCs {

-					if g.EdgeBetween(podNode, coveredRC) != nil {

+					if g.Edge(podNode, coveredRC) != nil {

 						continue pod

 					}

 				}

@@ -22,8 +22,8 @@ func DescendentNodesByNodeKind(g osgraph.Graph, visitedNodes graphview.IntSet, n

 	visitedNodes.Insert(node.ID())

 	ret := []graph.Node{}

-	for _, successor := range g.Successors(node) {

-		edge := g.EdgeBetween(node, successor)

+	for _, successor := range g.From(node) {

+		edge := g.Edge(node, successor)

 		if edgeChecker(osgraph.New(), node, successor, g.EdgeKinds(edge)) {

 			if g.Kind(successor) == targetNodeKind {

@@ -49,7 +49,7 @@ func AddTriggerEdges(g osgraph.MutableUniqueGraph, node *deploygraph.DeploymentC

 }

 func AddAllTriggerEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if dcNode, ok := node.(*deploygraph.DeploymentConfigNode); ok {

 			AddTriggerEdges(g, dcNode)

 		}

@@ -57,7 +57,7 @@ func AddAllTriggerEdges(g osgraph.MutableUniqueGraph) {

 }

 func AddDeploymentEdges(g osgraph.MutableUniqueGraph, node *deploygraph.DeploymentConfigNode) *deploygraph.DeploymentConfigNode {

-	for _, n := range g.(graph.Graph).NodeList() {

+	for _, n := range g.(graph.Graph).Nodes() {

 		if rcNode, ok := n.(*kubegraph.ReplicationControllerNode); ok {

 			if BelongsToDeploymentConfig(node.DeploymentConfig, rcNode.ReplicationController) {

 				g.AddEdge(node, rcNode, DeploymentEdgeKind)

@@ -69,7 +69,7 @@ func AddDeploymentEdges(g osgraph.MutableUniqueGraph, node *deploygraph.Deployme

 }

 func AddAllDeploymentEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if dcNode, ok := node.(*deploygraph.DeploymentConfigNode); ok {

 			AddDeploymentEdges(g, dcNode)

 		}

@@ -16,19 +16,19 @@ func TestDCRCSpecNode(t *testing.T) {

 	dcNode := EnsureDeploymentConfigNode(g, dc)

-	if len(g.NodeList()) != 2 {

-		t.Errorf("expected 2 nodes, got %v", g.NodeList())

+	if len(g.Nodes()) != 2 {

+		t.Errorf("expected 2 nodes, got %v", g.Nodes())

 	}

-	if len(g.EdgeList()) != 1 {

-		t.Errorf("expected 2 edge, got %v", g.EdgeList())

+	if len(g.Edges()) != 1 {

+		t.Errorf("expected 2 edge, got %v", g.Edges())

 	}

-	edge := g.EdgeList()[0]

+	edge := g.Edges()[0]

 	if !g.EdgeKinds(edge).Has(osgraph.ContainsEdgeKind) {

 		t.Errorf("expected %v, got %v", osgraph.ContainsEdgeKind, g.EdgeKinds(edge))

 	}

-	if edge.Head().ID() != dcNode.ID() {

-		t.Errorf("expected %v, got %v", dcNode.ID(), edge.Head())

+	if edge.From().ID() != dcNode.ID() {

+		t.Errorf("expected %v, got %v", dcNode.ID(), edge.From())

 	}

 }

@@ -26,7 +26,7 @@ func AddImageStreamRefEdge(g osgraph.MutableUniqueGraph, node *imagegraph.ImageS

 // AddAllImageStreamRefEdges calls AddImageStreamRefEdge for every ImageStreamTagNode in the graph

 func AddAllImageStreamRefEdges(g osgraph.MutableUniqueGraph) {

-	for _, node := range g.(graph.Graph).NodeList() {

+	for _, node := range g.(graph.Graph).Nodes() {

 		if istNode, ok := node.(*imagegraph.ImageStreamTagNode); ok {

 			AddImageStreamRefEdge(g, istNode)

 		}

@@ -350,7 +350,7 @@ func addImageStreamsToGraph(g graph.Graph, streams *imageapi.ImageStreamList, al

 				}

 				glog.V(4).Infof("Checking for existing strong reference from stream %s/%s to image %s", stream.Namespace, stream.Name, imageNode.Image.Name)

-				if edge := g.EdgeBetween(imageStreamNode, imageNode); edge != nil && g.EdgeKinds(edge).Has(ReferencedImageEdgeKind) {

+				if edge := g.Edge(imageStreamNode, imageNode); edge != nil && g.EdgeKinds(edge).Has(ReferencedImageEdgeKind) {

 					glog.V(4).Infof("Strong reference found")

 					continue

 				}

@@ -360,7 +360,7 @@ func addImageStreamsToGraph(g graph.Graph, streams *imageapi.ImageStreamList, al

 				glog.V(4).Infof("Adding stream->layer references")

 				// add stream -> layer references so we can prune them later

-				for _, s := range g.Successors(imageNode) {

+				for _, s := range g.From(imageNode) {

 					if g.Kind(s) != imagegraph.ImageLayerNodeKind {

 						continue

 					}

@@ -547,7 +547,7 @@ func getImageNodes(nodes []gonum.Node) []*imagegraph.ImageNode {

 // edgeKind returns true if the edge from "from" to "to" is of the desired kind.

 func edgeKind(g graph.Graph, from, to gonum.Node, desiredKind string) bool {

-	edge := g.EdgeBetween(from, to)

+	edge := g.Edge(from, to)

 	kinds := g.EdgeKinds(edge)

 	return kinds.Has(desiredKind)

 }

@@ -560,7 +560,7 @@ func edgeKind(g graph.Graph, from, to gonum.Node, desiredKind string) bool {

 func imageIsPrunable(g graph.Graph, imageNode *imagegraph.ImageNode) bool {

 	onlyWeakReferences := true

-	for _, n := range g.Predecessors(imageNode) {

+	for _, n := range g.To(imageNode) {

 		glog.V(4).Infof("Examining predecessor %#v", n)

 		if !edgeKind(g, n, imageNode, WeakReferencedImageEdgeKind) {

 			glog.V(4).Infof("Strong reference detected")

@@ -615,7 +615,7 @@ func subgraphWithoutPrunableImages(g graph.Graph, prunableImageIDs graph.NodeSet

 func calculatePrunableLayers(g graph.Graph) []*imagegraph.ImageLayerNode {

 	prunable := []*imagegraph.ImageLayerNode{}

-	nodes := g.NodeList()

+	nodes := g.Nodes()

 	for i := range nodes {

 		layerNode, ok := nodes[i].(*imagegraph.ImageLayerNode)

 		if !ok {

@@ -641,7 +641,7 @@ func pruneStreams(g graph.Graph, imageNodes []*imagegraph.ImageNode, streamPrune

 	glog.V(4).Infof("Removing pruned image references from streams")

 	for _, imageNode := range imageNodes {

-		for _, n := range g.Predecessors(imageNode) {

+		for _, n := range g.To(imageNode) {

 			streamNode, ok := n.(*imagegraph.ImageStreamNode)

 			if !ok {

 				continue

@@ -722,7 +722,7 @@ func (p *imageRegistryPruner) determineRegistry(imageNodes []*imagegraph.ImageNo

 // image, and then it identifies layers eligible for pruning, invoking

 // layerPruneFunc for each registry URL that has layers that can be pruned.

 func (p *imageRegistryPruner) Prune(imagePruner ImagePruner, streamPruner ImageStreamPruner, layerPruner LayerPruner, blobPruner BlobPruner, manifestPruner ManifestPruner) error {

-	allNodes := p.g.NodeList()

+	allNodes := p.g.Nodes()

 	imageNodes := getImageNodes(allNodes)

 	if len(imageNodes) == 0 {

@@ -763,7 +763,7 @@ func (p *imageRegistryPruner) Prune(imagePruner ImagePruner, streamPruner ImageS

 // layerIsPrunable returns true if the layer is not referenced by any images.

 func layerIsPrunable(g graph.Graph, layerNode *imagegraph.ImageLayerNode) bool {

-	for _, predecessor := range g.Predecessors(layerNode) {

+	for _, predecessor := range g.To(layerNode) {

 		glog.V(4).Infof("Examining layer predecessor %#v", predecessor)

 		if g.Kind(predecessor) == imagegraph.ImageNodeKind {

 			glog.V(4).Infof("Layer has an image predecessor")

@@ -779,7 +779,7 @@ func layerIsPrunable(g graph.Graph, layerNode *imagegraph.ImageLayerNode) bool {

 func streamLayerReferences(g graph.Graph, layerNode *imagegraph.ImageLayerNode) []*imagegraph.ImageStreamNode {

 	ret := []*imagegraph.ImageStreamNode{}

-	for _, predecessor := range g.Predecessors(layerNode) {

+	for _, predecessor := range g.To(layerNode) {

 		if g.Kind(predecessor) != imagegraph.ImageStreamNodeKind {

 			continue

 		}

@@ -834,7 +834,7 @@ func pruneManifests(g graph.Graph, registryClient *http.Client, registryURL stri

 	errs := []error{}

 	for _, imageNode := range imageNodes {

-		for _, n := range g.Predecessors(imageNode) {

+		for _, n := range g.To(imageNode) {

 			streamNode, ok := n.(*imagegraph.ImageStreamNode)

 			if !ok {

 				continue