diff --git a/libs/avahi/files/service-http b/libs/avahi/files/service-http
index 7e9be2d42..326203792 100644
--- a/libs/avahi/files/service-http
+++ b/libs/avahi/files/service-http
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <!DOCTYPE service-group SYSTEM "avahi-service.dtd">
 <service-group>
- <name replace-wildcards="yes">Web Server on %h</name>
+ <name replace-wildcards="yes">%h</name>
   <service>
    <type>_http._tcp</type>
    <port>80</port>
diff --git a/libs/avahi/files/service-ssh b/libs/avahi/files/service-ssh
index b41580378..b44585157 100644
--- a/libs/avahi/files/service-ssh
+++ b/libs/avahi/files/service-ssh
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <!DOCTYPE service-group SYSTEM "avahi-service.dtd">
 <service-group>
- <name replace-wildcards="yes">Secure Shell on %h</name>
+ <name replace-wildcards="yes">%h</name>
   <service>
    <type>_ssh._tcp</type>
    <port>22</port>