diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.csharp.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.csharp.json
index 834c7ed6095..8c0a68261ca 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.csharp.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.csharp.json
@@ -1,7 +1,7 @@
 {
 "id" : "org.eclipse.che.ls.csharp",
 "name": "C# language server",
-"description" : "C# support",
+"description" : "C# intellisense",
 "dependencies": [],
 "properties": {
 },
diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.json.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.json.json
index e389eed67d9..fcf056fc0e0 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.json.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.json.json
@@ -1,7 +1,7 @@
 {
 "id": "org.eclipse.che.ls.json",
 "name": "JSON language server",
-"description" : "JSON support",
+"description" : "JSON intellisense",
 "dependencies": [],
 "properties": {
 },
diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.php.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.php.json
index 3a2890dad9b..6d6f4611cf5 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.php.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ls.php.json
@@ -1,7 +1,7 @@
 {
   "id": "org.eclipse.che.ls.php",
   "name": "PHP language server",
-  "description": "PHP support",
+  "description": "PHP intellisense",
   "dependencies": [],
   "properties": {},
   "script": "#\n# Copyright (c) 2012-2016 Codenvy, S.A.\n# All rights reserved. This program and the accompanying materials\n# are made available under the terms of the Eclipse Public License v1.0\n# which accompanies this distribution, and is available at\n# http://www.eclipse.org/legal/epl-v10.html\n#\n# Contributors:\n# Codenvy, S.A. - initial API and implementation\n#\n\nunset PACKAGES\nunset SUDO\ncommand -v tar >/dev/null 2>&1 || { PACKAGES=${PACKAGES}\" tar\"; }\ncommand -v curl >/dev/null 2>&1 || { PACKAGES=${PACKAGES}\" curl\"; }\ntest \"$(id -u)\" = 0 || SUDO=\"sudo\"\n\nAGENT_BINARIES_URI=https://codenvy.com/update/repository/public/download/org.eclipse.che.ls.php.binaries\nCHE_DIR=$HOME/che\nLS_DIR=${CHE_DIR}/ls-php\nLS_LAUNCHER=${LS_DIR}/launch.sh\n\nLINUX_TYPE=$(cat /etc/os-release | grep ^ID= | tr '[:upper:]' '[:lower:]')\nLINUX_VERSION=$(cat /etc/os-release | grep ^VERSION_ID=)\nMACHINE_TYPE=$(uname -m)\n\nmkdir -p ${CHE_DIR}\nmkdir -p ${LS_DIR}\n\n########################\n### Install packages ###\n########################\n\n# Red Hat Enterprise Linux 7\n############################\nif echo ${LINUX_TYPE} | grep -qi \"rhel\"; then\n test \"${PACKAGES}\" = \"\" || {\n ${SUDO} yum install ${PACKAGES};\n }\n\n\n# Ubuntu 14.04 16.04 / Linux Mint 17\n####################################\nelif echo ${LINUX_TYPE} | grep -qi \"ubuntu\"; then\n test \"${PACKAGES}\" = \"\" || {\n ${SUDO} apt-get update;\n ${SUDO} apt-get -y install ${PACKAGES};\n }\n\n\n# Debian 8\n##########\nelif echo ${LINUX_TYPE} | grep -qi \"debian\"; then\n test \"${PACKAGES}\" = \"\" || {\n ${SUDO} apt-get update;\n ${SUDO} apt-get -y install ${PACKAGES};\n }\n\n# Fedora 23\n###########\nelif echo ${LINUX_TYPE} | grep -qi \"fedora\"; then\n PACKAGES=${PACKAGES}\" procps-ng\"\n test \"${PACKAGES}\" = \"\" || {\n ${SUDO} dnf -y install ${PACKAGES};\n }\n\n\n# CentOS 7.1 & Oracle Linux 7.1\n###############################\nelif echo ${LINUX_TYPE} | grep -qi \"centos\"; then\n test \"${PACKAGES}\" = \"\" || {\n ${SUDO} yum -y install ${PACKAGES};\n }\n\n# openSUSE 13.2\n###############\nelif echo ${LINUX_TYPE} | grep -qi \"opensuse\"; then\n test \"${PACKAGES}\" = \"\" || {\n ${SUDO} zypper install -y ${PACKAGES};\n }\n\nelse\n >&2 echo \"Unrecognized Linux Type\"\n >&2 cat /etc/os-release\n exit 1\nfi\n\n\n######################\n### Install PHP LS ###\n######################\n\ncurl -s ${AGENT_BINARIES_URI} | tar xzf - -C ${LS_DIR}\n\ntouch ${LS_LAUNCHER}\nchmod +x ${LS_LAUNCHER}\necho \"export LD_LIBRARY_PATH=${LS_DIR}/php7-minimal\" > ${LS_LAUNCHER}\necho \"${LS_DIR}/php7-minimal/php -c ${LS_DIR}/php7-minimal/php.ini ${LS_DIR}/php-language-server/bin/php-language-server.php\" >> ${LS_LAUNCHER}"
diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ssh.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ssh.json
index 70ddf2a3cc1..1b77859fb3f 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ssh.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ssh.json
@@ -1,7 +1,7 @@
 {
   "id": "org.eclipse.che.ssh",
   "name": "SSH",
-  "description": "SSH support",
+  "description": "SSH server, key-pair generation",
   "dependencies": [],
   "properties": {},
   "servers": {
diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.terminal.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.terminal.json
index 13649dbee0c..b3d3bdb0847 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.terminal.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.terminal.json
@@ -1,7 +1,7 @@
 {
   "id": "org.eclipse.che.terminal",
   "name": "Terminal",
-  "description": "Terminal support",
+  "description": "Embedded web terminal",
   "dependencies": [],
   "properties": {},
   "servers": {
diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.unison.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.unison.json
index 49e2b567392..4481acf9edb 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.unison.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.unison.json
@@ -1,6 +1,6 @@
 {
 "id": "org.eclipse.che.unison",
-"name": "Unison",
+"name": "File Sync",
 "description": "Unison File Synchronizer",
 "dependencies": [],
 "properties": {},
diff --git a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ws-agent.json b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ws-agent.json
index 03949ed89aa..98b1b89f66e 100644
--- a/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ws-agent.json
+++ b/wsmaster/che-core-api-agent/src/main/resources/agents/org.eclipse.che.ws-agent.json
@@ -1,7 +1,7 @@
 {
   "id": "org.eclipse.che.ws-agent",
-  "name": "WS-agent",
-  "description": "WS-agent support",
+  "name": "Workspace API",
+  "description": "Workspace API support",
   "dependencies": [
     "org.eclipse.che.terminal"
   ],