Cleaned up the SRLG and disjoint path code and naming.

Change-Id: I02b6fe5ee1e3f5eadc4e88800386a23349ee5e58
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
index f194878..039a205 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
@@ -149,8 +149,8 @@
      * be treated as if they were in the same risk group.
      * @return set of shortest paths
      */
-    Set<DisjointPath> getSRLGDisjointPaths(Topology topology, DeviceId src, DeviceId dst,
-                                           LinkWeight weight, Map<Link, Object> riskProfile);
+    Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src, DeviceId dst,
+                                       LinkWeight weight, Map<Link, Object> riskProfile);
 
     /**
      * Returns the set of pre-computed SRLG shortest paths between src and dest.
@@ -162,8 +162,8 @@
      * be treated as if they were in the same risk group.
      * @return set of shortest paths
      */
-    Set<DisjointPath> getSRLGDisjointPaths(Topology topology, DeviceId src, DeviceId dst,
-                                           Map<Link, Object> riskProfile);
+    Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src, DeviceId dst,
+                                       Map<Link, Object> riskProfile);
 
 
     /**