diff --git a/admin-root/config.xml b/admin-root/config.xml
index 6c29b688..ab5a1917 100644
--- a/admin-root/config.xml
+++ b/admin-root/config.xml
@@ -7,7 +7,7 @@
                 The name iTunes and other daap clients should see
             </short_description>
             <long_description>
-                This is both the name of the server as advertised via rendezvous, and the
+                This is both the name of the server as advertised via Bonjour, and the
                 name of the database exported via DAAP. Also know as "What shows up in
                 iTunes".
             </long_description>
@@ -43,7 +43,7 @@
             <type size="20">text</type>
         </item>
         <item id="general:password">
-            <name>MP3 Password</name>
+            <name>Music Password</name>
             <short_description>
                 The password clients need to access this server.
             </short_description>
@@ -83,9 +83,9 @@
 
     <section name="Music Files">
         <item id="general:mp3_dir" required="true">
-            <name>MP3 Directory</name>
+            <name>Music Folder</name>
             <short_description></short_description>
-            <type size="80" multiple="true" add_item_label="Add mp3 directory" browse="directory">text</type>
+            <type size="80" multiple="true" add_item_label="Add music folder" browse="directory">text</type>
         </item>
         <item id="general:extensions">
             <name>Extensions</name>
diff --git a/admin-root/status.html b/admin-root/status.html
index 33253f18..ceda4226 100644
--- a/admin-root/status.html
+++ b/admin-root/status.html
@@ -40,14 +40,14 @@ Update this page every
 </thead>
 <tbody>
   <tr>
-    <td>Rendezvous</td>
+    <td>Bonjour</td>
     <td id="rendezvous">Running</td>
     <td><!-- <a href="config-update.html?action=stopmdns">Stop MDNS Server</a> --></td>
   </tr>
   <tr>
-    <td>DAAP Server</td>
+    <td>Firefly Media Server</td>
     <td id="daap_server">Running</td>
-    <td><a href="config-update.html?action=stopdaap">Stop DAAP Server</a></td>
+    <td><a href="config-update.html?action=stopdaap">Stop Server</a></td>
   </tr>
   <tr>
     <td>File scanner</td>