Cleanup interfaces and fix port state issue
diff --git a/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java b/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java
index c5b7e66..7a8511b 100644
--- a/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java
@@ -17,12 +17,12 @@
 		String filter = (String) getRequestAttributes().get("filter");
 		
 		if (filter.equals("active")) {
-			return (Iterator<ISwitchObject>) impl.GetActiveSwitches().iterator();
+			return (Iterator<ISwitchObject>) impl.getActiveSwitches().iterator();
 		}
 		if (filter.equals("inactive")) {
-			return (Iterator<ISwitchObject>) impl.GetInactiveSwitches().iterator();
+			return (Iterator<ISwitchObject>) impl.getInactiveSwitches().iterator();
 		} else {
-		    return (Iterator<ISwitchObject>) impl.GetAllSwitches().iterator();
+		    return (Iterator<ISwitchObject>) impl.getAllSwitches().iterator();
 		}
 	}