diff --git a/conf/onos.properties b/conf/onos.properties
index 8e2c4cb..953ab78 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -1,6 +1,6 @@
 floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
 net.floodlightcontroller.threadpool.ThreadPool,\
-net.onrc.onos.ofcontroller.floodlightlistener.RCNetworkGraphPublisher, \
+net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher, \
 net.onrc.onos.datagrid.HazelcastDatagrid,\
 net.onrc.onos.ofcontroller.flowprogrammer.FlowProgrammer,\
 net.onrc.onos.intent.runtime.PathCalcRuntimeModule,\
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/RCNetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
similarity index 98%
rename from src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/RCNetworkGraphPublisher.java
rename to src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index e0b7c19..fba97f5 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/RCNetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -37,18 +37,18 @@
 /*
  * I've created a copy of the old NetworkGraphPublisher so I can integrate
  * the new API with ONOS while still having the old NetworkGraphPublisher
- * to reference. I've renamed to RCNetworkGraphPublisher.
+ * to reference.
  * TODO Remove old NetworkGraphPublisher once the integration of the new
  * API is complete.
  * For now, we just write to the database and don't worry about sending
  * notifications.
  * TODO Send notification after each database write
  */
-public class RCNetworkGraphPublisher implements /*IOFSwitchListener,*/
+public class NetworkGraphPublisher implements /*IOFSwitchListener,*/
 												IOFSwitchPortListener,
 												ILinkDiscoveryListener,
 												IFloodlightModule {
-	private static final Logger log = LoggerFactory.getLogger(RCNetworkGraphPublisher.class);
+	private static final Logger log = LoggerFactory.getLogger(NetworkGraphPublisher.class);
 
 	private IFloodlightProviderService floodlightProvider;
 	private ILinkDiscoveryService linkDiscovery;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java
index 7a6ef26..401a0c3 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java
@@ -19,7 +19,6 @@
 public class NetworkGraphModule implements IFloodlightModule, INetworkGraphService {
 
 	// This is initialized as a module for now
-	// private RCNetworkGraphPublisher eventListener;
 
 	private TopologyManager topologyManager;
 	//private NetworkGraphDatastore southboundNetworkGraph;
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index 6c6f83e..efe32ee 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -1,5 +1,5 @@
 net.floodlightcontroller.core.FloodlightProvider
-net.onrc.onos.ofcontroller.floodlightlistener.RCNetworkGraphPublisher
+net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher
 net.onrc.onos.ofcontroller.linkdiscovery.internal.LinkDiscoveryManager
 net.floodlightcontroller.topology.TopologyManager
 net.floodlightcontroller.forwarding.Forwarding