diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 966e180..503f2f3 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -224,7 +224,7 @@
 
 		ITopoSwitchService swService = new TopoSwitchServiceImpl();
 		
-		Iterable<ISwitchObject> switches = swService.GetActiveSwitches();
+		Iterable<ISwitchObject> switches = swService.getActiveSwitches();
 
 		List<Link> links = new ArrayList<Link>(); 
 		for (ISwitchObject sw : switches) {
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java
index 2dbb338..c452fcd 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java
@@ -19,14 +19,14 @@
  
 	LinkStorageImpl linkStore = store.get();
 	@Override
-	public List<Link> GetActiveLinks() {
+	public List<Link> getActiveLinks() {
 		// TODO Auto-generated method stub
 		List<Link> retval = linkStore.getActiveLinks();
 		return retval;
 	}
 
 	@Override
-	public List<Link> GetLinksOnSwitch(String dpid) {
+	public List<Link> getLinksOnSwitch(String dpid) {
 		// TODO Auto-generated method stub
 		return linkStore.getLinks(dpid);
 	}
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java b/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java
index a0770cb..25b68fb 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java
@@ -13,7 +13,7 @@
     public List<Link> retrieve() {
 		TopoLinkServiceImpl impl = new TopoLinkServiceImpl();
 		
-		List<Link> retval = impl.GetActiveLinks();
+		List<Link> retval = impl.getActiveLinks();
 		return retval;
 	}