Index: opennms-daemon/src/main/filtered/etc/viewsdisplay.xml
===================================================================
--- opennms-daemon/src/main/filtered/etc/viewsdisplay.xml	(revision 6441)
+++ opennms-daemon/src/main/filtered/etc/viewsdisplay.xml	(working copy)
@@ -8,7 +8,7 @@
 			<category><![CDATA[Network Interfaces]]></category>
 			<category><![CDATA[Web Servers]]></category>
 			<category><![CDATA[Email Servers]]></category>
-			<category><![CDATA[DNS & DHCP Servers]]></category>                    
+			<category><![CDATA[DNS and DHCP Servers]]></category>                    
 			<category><![CDATA[Database Servers]]></category>
 			<category><![CDATA[JMX Servers]]></category>
 			<category><![CDATA[Other Servers]]></category>
Index: opennms-daemon/src/main/filtered/etc/categories.xml
===================================================================
--- opennms-daemon/src/main/filtered/etc/categories.xml	(revision 6441)
+++ opennms-daemon/src/main/filtered/etc/categories.xml	(working copy)
@@ -59,7 +59,7 @@
                 <rule><![CDATA[isJBoss4 | isJBoss32 | isJVM]]></rule>
             </category>
             <category>
-                <label><![CDATA[DNS & DHCP Servers]]></label>
+                <label><![CDATA[DNS and DHCP Servers]]></label>
                 <comment>This category includes all managed interfaces which are running either DNS (name resolution) servers or DHCP servers.</comment>
                 <normal>99.99</normal>
                 <warning>97</warning>