CORD Subscriber GUI -- Minor tweaks.

Change-Id: I0cfcb4702366170d433b4d9b45d36b59a24597df
diff --git a/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/BundleFactoryTest.java b/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/BundleFactoryTest.java
index f2b94b6..999ee97 100644
--- a/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/BundleFactoryTest.java
+++ b/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/BundleFactoryTest.java
@@ -43,7 +43,7 @@
         Set<XosFunctionDescriptor> funcs = bundle.functions();
         assertTrue("missing internet", funcs.contains(INTERNET));
         assertTrue("missing firewall", funcs.contains(FIREWALL));
-        assertFalse("unexpected url-f", funcs.contains(URL_FILTERING));
+        assertFalse("unexpected url-f", funcs.contains(URL_FILTER));
     }
 
     @Test
@@ -54,7 +54,7 @@
         Set<XosFunctionDescriptor> funcs = bundle.functions();
         assertTrue("missing internet", funcs.contains(INTERNET));
         assertTrue("missing firewall", funcs.contains(FIREWALL));
-        assertTrue("missing url-f", funcs.contains(URL_FILTERING));
+        assertTrue("missing url-f", funcs.contains(URL_FILTER));
     }
 
 }
diff --git a/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/XosFunctionDescriptorTest.java b/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/XosFunctionDescriptorTest.java
index 7068c16..c08d019 100644
--- a/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/XosFunctionDescriptorTest.java
+++ b/apps/demo/cord-gui/src/test/org/onosproject/cord/gui/model/XosFunctionDescriptorTest.java
@@ -49,8 +49,8 @@
 
     @Test
     public void urlFiltering() {
-        assertEquals("wrong id", "url_filtering", URL_FILTERING.id());
-        assertEquals("wrong display", "Parental Control", URL_FILTERING.displayName());
-        assertTrue("wrong desc", URL_FILTERING.description().startsWith("Variable"));
+        assertEquals("wrong id", "url_filtering", URL_FILTER.id());
+        assertEquals("wrong display", "Parental Control", URL_FILTER.displayName());
+        assertTrue("wrong desc", URL_FILTER.description().startsWith("Variable"));
     }
 }