diff --git a/conf/UMS.conf.default b/conf/UMS.conf.default
index c0ea48a..03c9ae7 100644
--- a/conf/UMS.conf.default
+++ b/conf/UMS.conf.default
@@ -38,7 +38,7 @@
 # -----------
 # The server name is displayed in the renderer before the profile name.
 # Default: "Universal Media Server"
-server_name =__NAME__
+server_name =__SERVER_NAME__
 
 # Append profile name
 # -------------------
diff --git a/manifest.json b/manifest.json
index 8774f83..442935b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,7 +37,7 @@
                 }
             },
             {
-                "name":"name",
+                "name":"server_name",
                 "type":"string",
                 "example":"MyUMS",
                 "default": "UniversalMediaServer",
diff --git a/scripts/install b/scripts/install
index e11a488..0156480 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,7 +27,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=/
 is_public=$YNH_APP_ARG_IS_PUBLIC
-name=$YNH_APP_ARG_NAME
+server_name=$YNH_APP_ARG_SERVER_NAME
 interface=$YNH_APP_ARG_INTERFACE