diff --git a/src/main/java/com/syncleus/dann/graph/AbstractAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graph/AbstractAdjacencyGraph.java
index 71983f6777f413c20c0fd80c19f170606882e055..c6fac7c4a986e18f9278b7a25c62ef6fac08f827 100644
--- a/src/main/java/com/syncleus/dann/graph/AbstractAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graph/AbstractAdjacencyGraph.java
@@ -563,7 +563,7 @@ public abstract class AbstractAdjacencyGraph<
 	}
 
 	@Override
-	public Set<Graph.Endpoint<N,E,PA>> getEndPoints()
+	public Set<Graph.Endpoint<N,E,PA>> getEndpoints()
 	{
 		final Set<Graph.Endpoint<N,E,PA>> endpoints = new HashSet<Graph.Endpoint<N,E,PA>>();
 		endpoints.addAll(this.getNodeEndpoints());
@@ -637,7 +637,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final E sourceEdge = (E) source;
 			final Set<N> sourceNodes = new HashSet<N>();
-			for(Endpoint<? extends N> endpoint : sourceEdge.getEndPoints())
+			for(Endpoint<? extends N> endpoint : sourceEdge.getEndpoints())
 				if((endpoint.getTraversableNeighborsFrom().size() > 0)&&(!sourceNodes.contains(endpoint.getTarget())))
 				{
 					if(this.isTraversable(endpoint.getTarget(), destination))
@@ -650,7 +650,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final E destinationEdge = (E) destination;
 			final Set<N> destinationNodes = new HashSet<N>();
-			for(Endpoint<? extends N> endpoint : destinationEdge.getEndPoints())
+			for(Endpoint<? extends N> endpoint : destinationEdge.getEndpoints())
 				if((endpoint.isTraversable())&&(!destinationNodes.contains(endpoint.getTarget())))
 				{
 					if(this.isTraversable(source, endpoint.getTarget()))
@@ -1000,7 +1000,7 @@ public abstract class AbstractAdjacencyGraph<
 			final Set<Graph.NodeEndpoint<N, E>> adjacentNodes = new HashSet<Graph.NodeEndpoint<N, E>>();
 
 			for(Graph.EdgeEndpoint<N, E> adjacentEndpoint : this.getAdjacentEdges() )
-				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndPoints(this.getTarget()) )
+				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndpoints(this.getTarget()) )
 					for( Edge.Endpoint<? extends N> adjacentNodeEndpoint : nodeEndpoint.getNeighbors() )
 						adjacentNodes.addAll(AbstractAdjacencyGraph.this.getNodeEndpoints(adjacentNodeEndpoint.getTarget()));
 
@@ -1013,7 +1013,7 @@ public abstract class AbstractAdjacencyGraph<
 			final Set<Graph.NodeEndpoint<N, E>> adjacentNodes = new HashSet<Graph.NodeEndpoint<N, E>>();
 
 			for(Graph.EdgeEndpoint<N, E> adjacentEndpoint : this.getAdjacentEdges() )
-				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndPoints(this.getTarget()) )
+				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndpoints(this.getTarget()) )
 					for( Edge.Endpoint<? extends N> adjacentNodeEndpoint : nodeEndpoint.getTraversableNeighborsTo() )
 						adjacentNodes.addAll(AbstractAdjacencyGraph.this.getNodeEndpoints(adjacentNodeEndpoint.getTarget()));
 
@@ -1026,7 +1026,7 @@ public abstract class AbstractAdjacencyGraph<
 			final Set<Graph.NodeEndpoint<N, E>> adjacentNodes = new HashSet<Graph.NodeEndpoint<N, E>>();
 
 			for(Graph.EdgeEndpoint<N, E> adjacentEndpoint : this.getAdjacentEdges() )
-				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndPoints(this.getTarget()) )
+				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndpoints(this.getTarget()) )
 					for( Edge.Endpoint<? extends N> adjacentNodeEndpoint : nodeEndpoint.getTraversableNeighborsFrom() )
 						adjacentNodes.addAll(AbstractAdjacencyGraph.this.getNodeEndpoints(adjacentNodeEndpoint.getTarget()));
 
@@ -1039,7 +1039,7 @@ public abstract class AbstractAdjacencyGraph<
 			final Set<Graph.EdgeEndpoint<N, E>> adjacentEdges = new HashSet<Graph.EdgeEndpoint<N, E>>();
 
 			for(Graph.EdgeEndpoint<N, E> adjacentEndpoint : this.getAdjacentEdges() )
-				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndPoints(this.getTarget()) )
+				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndpoints(this.getTarget()) )
 					if( nodeEndpoint.isTraversable() )
 						adjacentEdges.add(adjacentEndpoint);
 
@@ -1052,7 +1052,7 @@ public abstract class AbstractAdjacencyGraph<
 			final Set<Graph.EdgeEndpoint<N, E>> adjacentEdges = new HashSet<Graph.EdgeEndpoint<N, E>>();
 
 			for(Graph.EdgeEndpoint<N, E> adjacentEndpoint : this.getAdjacentEdges() )
-				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndPoints(this.getTarget()) )
+				for( Edge.Endpoint<? extends N> nodeEndpoint : adjacentEndpoint.getTarget().getEndpoints(this.getTarget()) )
 					if( nodeEndpoint.isTraversable() )
 						adjacentEdges.add(adjacentEndpoint);
 
@@ -1067,7 +1067,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final Set<Graph.NodeEndpoint<N, E>> adjacentNodes = new HashSet<Graph.NodeEndpoint<N, E>>();
 
-			for(Endpoint<? extends N> adjacentEndpoint : this.getTarget().getEndPoints())
+			for(Endpoint<? extends N> adjacentEndpoint : this.getTarget().getEndpoints())
 				adjacentNodes.addAll(AbstractAdjacencyGraph.this.getNodeEndpoints(adjacentEndpoint.getTarget()));
 
 			return Collections.unmodifiableSet(adjacentNodes);
@@ -1078,7 +1078,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final Set<Graph.EdgeEndpoint<N, E>> adjacentEdges = new HashSet<Graph.EdgeEndpoint<N, E>>();
 
-			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndPoints())
+			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndpoints())
 				for( NEP neighborNode : AbstractAdjacencyGraph.this.getNodeEndpoints(sourceEndpoint.getTarget()) )
 					adjacentEdges.addAll(AbstractAdjacencyGraph.this.getAdjacentEdgeEndPoint(neighborNode));
 
@@ -1091,7 +1091,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final Set<Graph.EdgeEndpoint<N, E>> adjacentEdges = new HashSet<Graph.EdgeEndpoint<N, E>>();
 
-			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndPoints())
+			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndpoints())
 				if( sourceEndpoint.getTraversableNeighborsFrom().size() > 0 )
 					for( NEP adjacentNode : AbstractAdjacencyGraph.this.getNodeEndpoints(sourceEndpoint.getTarget()))
 						for( Graph.EdgeEndpoint<N, E> adjacentEdge : AbstractAdjacencyGraph.this.getAdjacentEdgeEndPoint(adjacentNode) )
@@ -1106,7 +1106,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final Set<Graph.EdgeEndpoint<N, E>> adjacentEdges = new HashSet<Graph.EdgeEndpoint<N, E>>();
 
-			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndPoints())
+			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndpoints())
 				if( sourceEndpoint.getTraversableNeighborsTo().size() > 0 )
 					for( NEP adjacentNode : AbstractAdjacencyGraph.this.getNodeEndpoints(sourceEndpoint.getTarget()))
 						for( Graph.EdgeEndpoint<N, E> adjacentEdge : AbstractAdjacencyGraph.this.getAdjacentEdgeEndPoint(adjacentNode) )
@@ -1121,7 +1121,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final Set<Graph.NodeEndpoint<N, E>> adjacentNodes = new HashSet<Graph.NodeEndpoint<N, E>>();
 
-			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndPoints())
+			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndpoints())
 				if( sourceEndpoint.getTraversableNeighborsFrom().size() > 0 )
 					adjacentNodes.addAll(AbstractAdjacencyGraph.this.getNodeEndpoints(sourceEndpoint.getTarget()));
 
@@ -1133,7 +1133,7 @@ public abstract class AbstractAdjacencyGraph<
 		{
 			final Set<Graph.NodeEndpoint<N, E>> adjacentNodes = new HashSet<Graph.NodeEndpoint<N, E>>();
 
-			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndPoints())
+			for(Endpoint<? extends N> sourceEndpoint : this.getTarget().getEndpoints())
 				if( sourceEndpoint.getTraversableNeighborsTo().size() > 0 )
 					adjacentNodes.addAll(AbstractAdjacencyGraph.this.getNodeEndpoints(sourceEndpoint.getTarget()));
 
diff --git a/src/main/java/com/syncleus/dann/graph/AbstractBidirectedEdge.java b/src/main/java/com/syncleus/dann/graph/AbstractBidirectedEdge.java
index f5f44033b340c2705e03cb065e2aec8773dbfded..fb697df6ff9361fa39f416ab120539dd9a6b5783 100644
--- a/src/main/java/com/syncleus/dann/graph/AbstractBidirectedEdge.java
+++ b/src/main/java/com/syncleus/dann/graph/AbstractBidirectedEdge.java
@@ -33,7 +33,7 @@ public abstract class AbstractBidirectedEdge<N, LN extends N, RN extends N> exte
 	public abstract AbstractEndpoint<RN,LN> getRightEndPoint();
 
 	@Override
-	public final Set<Endpoint<N, N>> getEndPoints()
+	public final Set<Endpoint<N, N>> getEndpoints()
 	{
 		return new EndPointsSet();
 	}
diff --git a/src/main/java/com/syncleus/dann/graph/AbstractEdge.java b/src/main/java/com/syncleus/dann/graph/AbstractEdge.java
index 849a6e5fb8f395bd2bd95d5b0ce5fe443c98490b..0d570aae9d9dc382857bb3c212a6404e452cf776 100644
--- a/src/main/java/com/syncleus/dann/graph/AbstractEdge.java
+++ b/src/main/java/com/syncleus/dann/graph/AbstractEdge.java
@@ -37,7 +37,7 @@ public abstract class AbstractEdge<
 	@Override
 	public boolean contains(final PA node)
 	{
-		for( EP endpoint : this.getEndPoints() )
+		for( EP endpoint : this.getEndpoints() )
 			if( endpoint.getTarget().equals(node))
 				return true;
 		return false;
@@ -47,17 +47,17 @@ public abstract class AbstractEdge<
 	public Set<PA> getTargets()
 	{
 		final Set<PA> nodes = new HashSet<PA>();
-		for( EP endpoint : this.getEndPoints() )
+		for( EP endpoint : this.getEndpoints() )
 			nodes.add(endpoint.getTarget());
 
 		return Collections.unmodifiableSet(nodes);
 	}
 
 	@Override
-	public Set<EP> getEndPoints(PA node)
+	public Set<EP> getEndpoints(PA node)
 	{
 		final Set<EP> nodesEndpoints = new HashSet<EP>();
-		for( EP endpoint : this.getEndPoints() )
+		for( EP endpoint : this.getEndpoints() )
 			if( endpoint.getTarget().equals(node))
 				nodesEndpoints.add(endpoint);
 
@@ -68,7 +68,7 @@ public abstract class AbstractEdge<
 	public Set<PA> getNeighbors(final PA source)
 	{
 		final Set<PA> nodes = new HashSet<PA>();
-		for( final EP sourceEndpoint : this.getEndPoints(source) )
+		for( final EP sourceEndpoint : this.getEndpoints(source) )
 			for( final Edge.Endpoint<PA> fromEndpoint : sourceEndpoint.getNeighbors())
 				nodes.add(fromEndpoint.getTarget());
 
@@ -79,7 +79,7 @@ public abstract class AbstractEdge<
 	public Set<PA> getTraversableFrom(PA source)
 	{
 		final Set<PA> nodes = new HashSet<PA>();
-		for( final EP sourceEndpoint : this.getEndPoints(source) )
+		for( final EP sourceEndpoint : this.getEndpoints(source) )
 			for( final Edge.Endpoint<PA> fromEndpoint : sourceEndpoint.getTraversableNeighborsFrom())
 				nodes.add(fromEndpoint.getTarget());
 
@@ -90,7 +90,7 @@ public abstract class AbstractEdge<
 	public Set<PA> getTraversableTo(PA destination)
 	{
 		final Set<PA> nodes = new HashSet<PA>();
-		for( final EP destinationEndpoint : this.getEndPoints(destination) )
+		for( final EP destinationEndpoint : this.getEndpoints(destination) )
 			for( final Edge.Endpoint<PA> fromEndpoint : destinationEndpoint.getTraversableNeighborsTo())
 				nodes.add(fromEndpoint.getTarget());
 
@@ -257,7 +257,7 @@ public abstract class AbstractEdge<
 			public boolean isEmpty()
 			{
 				assert !getTargets().isEmpty();
-				return ( getEndPoints().size() <= 1 ? true : false );
+				return ( getEndpoints().size() <= 1 ? true : false );
 			}
 
 			@Override
@@ -265,7 +265,7 @@ public abstract class AbstractEdge<
 			{
 				if( getTarget().equals(o) )
 					return false;
-				return getEndPoints().contains(o);
+				return getEndpoints().contains(o);
 			}
 
 			@Override
@@ -277,7 +277,7 @@ public abstract class AbstractEdge<
 			@Override
 			public Object[] toArray()
 			{
-				final Set<EP> copiedNodes = new HashSet<EP>(getEndPoints());
+				final Set<EP> copiedNodes = new HashSet<EP>(getEndpoints());
 				copiedNodes.remove(getTarget());
 				return copiedNodes.toArray();
 			}
@@ -285,7 +285,7 @@ public abstract class AbstractEdge<
 			@Override
 			public <PA> PA[] toArray(PA[] a)
 			{
-				final Set<EP> copiedNodes = new HashSet<EP>(getEndPoints());
+				final Set<EP> copiedNodes = new HashSet<EP>(getEndpoints());
 				copiedNodes.remove(getTarget());
 				return copiedNodes.toArray(a);
 			}
@@ -307,7 +307,7 @@ public abstract class AbstractEdge<
 			{
 				if( c.contains(AbstractEndpoint.this) )
 					return false;
-				return getEndPoints().containsAll(c);
+				return getEndpoints().containsAll(c);
 			}
 
 			@Override
@@ -335,19 +335,19 @@ public abstract class AbstractEdge<
 			@Override
 			public void clear()
 			{
-				if( getEndPoints().size() <= 1 )
+				if( getEndpoints().size() <= 1 )
 					return;
 				throw new UnsupportedOperationException("This set is read-only!");
 			}
 
 			private class NeighborIterator implements Iterator<Edge.Endpoint<PA>>
 			{
-				private int nextLeft = (getEndPoints().size()-1);
+				private int nextLeft = (getEndpoints().size()-1);
 				final private Iterator<EP> iterator;
 
 				public NeighborIterator()
 				{
-					this.iterator = getEndPoints().iterator();
+					this.iterator = getEndpoints().iterator();
 				}
 
 				@Override
diff --git a/src/main/java/com/syncleus/dann/graph/Edge.java b/src/main/java/com/syncleus/dann/graph/Edge.java
index 2df72ce6d1a325b4e9400a699bdee68e7e56f818..d3b7ca9b49e61ad63e85740101a14e665fbc9927 100644
--- a/src/main/java/com/syncleus/dann/graph/Edge.java
+++ b/src/main/java/com/syncleus/dann/graph/Edge.java
@@ -42,8 +42,8 @@ public interface Edge<
 		T getTarget();
 	};
 
-	Set<EP> getEndPoints();
-	Set<EP> getEndPoints(T node);
+	Set<EP> getEndpoints();
+	Set<EP> getEndpoints(T node);
 	boolean contains(T node);
 	Set<T> getTargets();
 	Set<T> getNeighbors(T source);
diff --git a/src/main/java/com/syncleus/dann/graph/SimpleHyperEdge.java b/src/main/java/com/syncleus/dann/graph/SimpleHyperEdge.java
index 06a5d2f35c395c5a234dbcff4cd037e56fbec23e..2a2fedfd7344d11dd7aa336a960cb0532bdd8623 100644
--- a/src/main/java/com/syncleus/dann/graph/SimpleHyperEdge.java
+++ b/src/main/java/com/syncleus/dann/graph/SimpleHyperEdge.java
@@ -121,7 +121,7 @@ public class SimpleHyperEdge<N> extends AbstractHyperEdge<N> implements MutableH
 	}
 
 	@Override
-	public Set<Endpoint<N, N>> getEndPoints()
+	public Set<Endpoint<N, N>> getEndpoints()
 	{
 	}