diff --git a/src/main/java/net/onrc/onos/core/topology/web/TopologyDevicesResource.java b/src/main/java/net/onrc/onos/core/topology/web/DevicesResource.java
similarity index 94%
rename from src/main/java/net/onrc/onos/core/topology/web/TopologyDevicesResource.java
rename to src/main/java/net/onrc/onos/core/topology/web/DevicesResource.java
index 4ca9927..ccad694 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/TopologyDevicesResource.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/DevicesResource.java
@@ -10,7 +10,7 @@
 /**
  * A class to access hosts information from the network topology.
  */
-public class TopologyDevicesResource extends ServerResource {
+public class DevicesResource extends ServerResource {
     /**
      * Gets the hosts information from the network topology.
      *
diff --git a/src/main/java/net/onrc/onos/core/topology/web/TopologyLinksResource.java b/src/main/java/net/onrc/onos/core/topology/web/LinksResource.java
similarity index 94%
rename from src/main/java/net/onrc/onos/core/topology/web/TopologyLinksResource.java
rename to src/main/java/net/onrc/onos/core/topology/web/LinksResource.java
index 7d287d3..2cbf036 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/TopologyLinksResource.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/LinksResource.java
@@ -10,7 +10,7 @@
 /**
  * A class to access links information from the network topology.
  */
-public class TopologyLinksResource extends ServerResource {
+public class LinksResource extends ServerResource {
     /**
      * Gets the links information from the network topology.
      *
diff --git a/src/main/java/net/onrc/onos/core/topology/web/TopologySwitchesResource.java b/src/main/java/net/onrc/onos/core/topology/web/SwitchesResource.java
similarity index 94%
rename from src/main/java/net/onrc/onos/core/topology/web/TopologySwitchesResource.java
rename to src/main/java/net/onrc/onos/core/topology/web/SwitchesResource.java
index 0d41ddd..1d4c9d6 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/TopologySwitchesResource.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/SwitchesResource.java
@@ -10,7 +10,7 @@
 /**
  * A class to access switches and ports information from the network topology.
  */
-public class TopologySwitchesResource extends ServerResource {
+public class SwitchesResource extends ServerResource {
     /**
      * Gets the switches and ports information from the network topology.
      *
diff --git a/src/main/java/net/onrc/onos/core/topology/web/TopologyAllResource.java b/src/main/java/net/onrc/onos/core/topology/web/TopologyResource.java
similarity index 93%
rename from src/main/java/net/onrc/onos/core/topology/web/TopologyAllResource.java
rename to src/main/java/net/onrc/onos/core/topology/web/TopologyResource.java
index 700ca60..c9476d0 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/TopologyAllResource.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/TopologyResource.java
@@ -10,7 +10,7 @@
 /**
  * A class to access the network topology information.
  */
-public class TopologyAllResource extends ServerResource {
+public class TopologyResource extends ServerResource {
     /**
      * Gets the network topology information.
      *
diff --git a/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java b/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java
index 3e5f145..8eb18d4 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java
@@ -17,10 +17,10 @@
         router.attach("/ds/ports/json", DatastorePortsResource.class);
 
         // Topology API
-        router.attach("", TopologyAllResource.class);
-        router.attach("/devices", TopologyDevicesResource.class);
-        router.attach("/links", TopologyLinksResource.class);
-        router.attach("/switches", TopologySwitchesResource.class);
+        router.attach("", TopologyResource.class);
+        router.attach("/devices", DevicesResource.class);
+        router.attach("/links", LinksResource.class);
+        router.attach("/switches", SwitchesResource.class);
 
         return router;
     }