diff --git a/src/api/che.ts b/src/api/che.ts
index 6e129ce20..eab740ba4 100644
--- a/src/api/che.ts
+++ b/src/api/che.ts
@@ -38,7 +38,7 @@ export class CheHelper {
   }
 
   /**
-   * Finds a pod where Che workspace is running.
+   * Finds a pod where workspace is running.
    * Rejects if no workspace is found for the given workspace ID
    * or if workspace ID wasn't specified but more than one workspace is found.
    */
@@ -63,7 +63,7 @@ export class CheHelper {
       if (wsPods.length === 1) {
         return wsPods[0].metadata!.name!
       }
-      throw new Error('More than one pod with running workspace is found. Please, specify Che Workspace ID.')
+      throw new Error('More than one pod with running workspace is found. Please, specify Workspace ID.')
     }
   }
 
@@ -88,7 +88,7 @@ export class CheHelper {
       if (wsPods.length === 1) {
         return wsPods[0].spec!.containers.map(c => c.name)
       }
-      throw new Error('More than one pod with running workspace is found. Please, specify Che Workspace ID.')
+      throw new Error('More than one pod with running workspace is found. Please, specify Workspace ID.')
     }
   }
 
diff --git a/src/commands/devfile/generate.ts b/src/commands/devfile/generate.ts
index 70c5ef43f..0c93f8585 100644
--- a/src/commands/devfile/generate.ts
+++ b/src/commands/devfile/generate.ts
@@ -36,7 +36,7 @@ const EditorComponents = new Map<Editor, DevfileComponent>([
 ])
 
 export default class Generate extends Command {
-  static description = 'generate and print a devfile to stdout given some Kubernetes resources and other Che workspaces features (project, language-support, commands etc...)'
+  static description = 'generate and print a devfile to stdout given some Kubernetes resources and other workspaces features (project, language-support, commands etc...)'
 
   static flags = {
     help: flags.help({ char: 'h' }),
@@ -58,7 +58,7 @@ export default class Generate extends Command {
       required: false,
     }),
     editor: string({
-      description: `Specify the Che editor component. Currently supported editors: ${editors}`,
+      description: `Specify the editor component. Currently supported editors: ${editors}`,
       env: 'EDITOR',
       required: false,
     }),
diff --git a/src/commands/server/delete.ts b/src/commands/server/delete.ts
index c0cf19fed..65669dd6d 100644
--- a/src/commands/server/delete.ts
+++ b/src/commands/server/delete.ts
@@ -19,7 +19,7 @@ import { OperatorTasks } from '../../tasks/installers/operator'
 import { K8sTasks } from '../../tasks/platforms/k8s'
 
 export default class Delete extends Command {
-  static description = 'delete any Che related resource: Kubernetes/OpenShift/Helm'
+  static description = 'delete any Eclipse Che related resource: Kubernetes/OpenShift/Helm'
 
   static flags = {
     help: flags.help({ char: 'h' }),
diff --git a/src/commands/server/start.ts b/src/commands/server/start.ts
index 8cd94b1c3..73f7be657 100644
--- a/src/commands/server/start.ts
+++ b/src/commands/server/start.ts
@@ -99,7 +99,7 @@ export default class Start extends Command {
       default: ''
     }),
     'os-oauth': flags.boolean({
-      description: 'Enable use of OpenShift credentials to log into Che',
+      description: 'Enable use of OpenShift credentials to log into Eclipse Che',
       default: false
     }),
     'che-operator-image': string({
@@ -209,11 +209,11 @@ export default class Start extends Command {
     // Platform Checks
     let platformCheckTasks = new Listr(platformTasks.preflightCheckTasks(flags, this), listrOptions)
 
-    // Checks if Che is already deployed
+    // Checks if Eclipse Che is already deployed
     let preInstallTasks = new Listr(undefined, listrOptions)
     preInstallTasks.add(k8sTasks.testApiTasks(flags, this))
     preInstallTasks.add({
-      title: '👀  Looking for an already existing Che instance',
+      title: '👀  Looking for an already existing Eclipse Che instance',
       task: () => new Listr(cheTasks.checkIfCheIsInstalledTasks(flags, this))
     })
 
@@ -221,7 +221,7 @@ export default class Start extends Command {
     let installTasks = new Listr(installerTasks.installTasks(flags, this), listrOptions)
 
     const startDeployedCheTasks = new Listr([{
-      title: '👀  Starting already deployed Che',
+      title: '👀  Starting already deployed Eclipse Che',
       task: () => new Listr(cheTasks.scaleCheUpTasks(this))
     }], listrOptions)
 
@@ -257,9 +257,9 @@ export default class Start extends Command {
         || (ctx.isPluginRegistryDeployed && !ctx.isPluginRegistryReady)
         || (ctx.isDevfileRegistryDeployed && !ctx.isDevfileRegistryReady)) {
         if (flags.platform || flags.installer) {
-          this.warn('Deployed Che is found and the specified installation parameters will be ignored')
+          this.warn('Deployed Eclipse Che is found and the specified installation parameters will be ignored')
         }
-        // perform Che start task if there is any component that is not ready
+        // perform Eclipse Che start task if there is any component that is not ready
         await startDeployedCheTasks.run(ctx)
       }
 
diff --git a/src/commands/server/stop.ts b/src/commands/server/stop.ts
index cd5be77d0..a9a4845b1 100644
--- a/src/commands/server/stop.ts
+++ b/src/commands/server/stop.ts
@@ -23,7 +23,7 @@ export default class Stop extends Command {
     chenamespace: cheNamespace,
     'deployment-name': cheDeployment,
     'che-selector': string({
-      description: 'Selector for Che Server resources',
+      description: 'Selector for Eclipse Che Server resources',
       default: 'app=che,component=che',
       env: 'CHE_SELECTOR'
     }),
@@ -52,16 +52,16 @@ export default class Stop extends Command {
         title: 'Deployment doesn\'t exist',
         enabled: (ctx: any) => !ctx.isCheDeployed,
         task: async () => {
-          await this.error(`E_BAD_DEPLOY - Deployment do not exist.\nA Deployment named "${flags['deployment-name']}" exist in namespace \"${flags.chenamespace}\", Che Server cannot be stopped.\nFix with: verify the namespace where Che is running (oc get projects)\nhttps://github.com/eclipse/che`, { code: 'E_BAD_DEPLOY' })
+          await this.error(`E_BAD_DEPLOY - Deployment do not exist.\nA Deployment named "${flags['deployment-name']}" exist in namespace \"${flags.chenamespace}\", Eclipse Che Server cannot be stopped.\nFix with: verify the namespace where Eclipse Che is running (oc get projects)\nhttps://github.com/eclipse/che`, { code: 'E_BAD_DEPLOY' })
         }
       },
       {
-        title: 'Che server was already stopped',
+        title: 'Eclipse Che server was already stopped',
         enabled: (ctx: any) => (ctx.isStopped),
         task: async () => { }
       },
       {
-        title: 'Che server Pod is not ready. It may be failing to start. Skipping shutdown request',
+        title: 'Eclipse Che server Pod is not ready. It may be failing to start. Skipping shutdown request',
         enabled: (ctx: any) => (ctx.isNotReadyYet),
         task: async () => { }
       }
diff --git a/src/commands/server/update.ts b/src/commands/server/update.ts
index e886922b6..b699745f5 100644
--- a/src/commands/server/update.ts
+++ b/src/commands/server/update.ts
@@ -102,11 +102,11 @@ export default class Update extends Command {
 
     this.checkIfInstallerSupportUpdating(flags)
 
-    // Checks if Che is already deployed
+    // Checks if Eclipse Che is already deployed
     let preInstallTasks = new Listr(undefined, listrOptions)
     preInstallTasks.add(k8sTasks.testApiTasks(flags, this))
     preInstallTasks.add({
-      title: '👀  Looking for an already existing Che instance',
+      title: '👀  Looking for an already existing Eclipse Che instance',
       task: () => new Listr(cheTasks.checkIfCheIsInstalledTasks(flags, this))
     })
 
@@ -130,9 +130,9 @@ export default class Update extends Command {
         await preUpdateTasks.run(ctx)
 
         if (!flags['skip-version-check']) {
-          await cli.anykey(`      Found deployed Che with operator [${ctx.deployedCheOperatorImage}]:${ctx.deployedCheOperatorTag}.
+          await cli.anykey(`      Found deployed Eclipse Che with operator [${ctx.deployedCheOperatorImage}]:${ctx.deployedCheOperatorTag}.
       You are going to update it to [${ctx.newCheOperatorImage}]:${ctx.newCheOperatorTag}.
-      Note that che operator will update components images (che server, plugin registry) only if their values
+      Note that Che Operator will update components images (che server, plugin registry) only if their values
       are not overridden in eclipse-che Customer Resource. So, you may need to remove them manually.
       Press q to quit or any key to continue`)
         }
diff --git a/src/commands/workspace/inject.ts b/src/commands/workspace/inject.ts
index bee533b58..55ccb7a7e 100644
--- a/src/commands/workspace/inject.ts
+++ b/src/commands/workspace/inject.ts
@@ -23,7 +23,7 @@ import { cheNamespace, listrRenderer } from '../../common-flags'
 import { CheTasks } from '../../tasks/che'
 
 export default class Inject extends Command {
-  static description = 'inject configurations and tokens in a Che Workspace'
+  static description = 'inject configurations and tokens in a workspace'
 
   static flags = {
     help: flags.help({ char: 'h' }),
@@ -37,7 +37,7 @@ export default class Inject extends Command {
     }),
     container: string({
       char: 'c',
-      description: 'Target container. If not specified, configuration files will be injected in all containers of a Che Workspace pod',
+      description: 'Target container. If not specified, configuration files will be injected in all containers of a workspace pod',
       required: false
     }),
     'kube-context': string({
diff --git a/src/commands/workspace/list.ts b/src/commands/workspace/list.ts
index 7fd94b391..f10c33848 100644
--- a/src/commands/workspace/list.ts
+++ b/src/commands/workspace/list.ts
@@ -13,7 +13,7 @@ import { Command, flags } from '@oclif/command'
 import { accessToken, cheNamespace, listrRenderer } from '../../common-flags'
 
 export default class List extends Command {
-  static description = 'list Che workspaces'
+  static description = 'list workspaces'
 
   static flags = {
     help: flags.help({ char: 'h' }),
@@ -28,7 +28,7 @@ export default class List extends Command {
     const notifier = require('node-notifier')
     const tasks = new Listr([
       { title: 'Verify if we can access Kubernetes API', skip: this.warn('Not implemented yet') },
-      { title: 'Verify if Che is running', skip: this.warn('Not implemented yet') },
+      { title: 'Verify if Eclipse Che is running', skip: this.warn('Not implemented yet') },
       { title: 'Get Workspaces', skip: this.warn('Not implemented yet') },
     ], { renderer: flags['listr-renderer'] as any })
 
diff --git a/src/commands/workspace/start.ts b/src/commands/workspace/start.ts
index 9676958ca..a245a5298 100644
--- a/src/commands/workspace/start.ts
+++ b/src/commands/workspace/start.ts
@@ -15,7 +15,7 @@ import { cli } from 'cli-ux'
 import { CheHelper } from '../../api/che'
 import { accessToken, cheNamespace, listrRenderer } from '../../common-flags'
 export default class Start extends Command {
-  static description = 'create and start a Che workspace'
+  static description = 'create and start a workspace'
 
   static flags = {
     help: flags.help({ char: 'h' }),
@@ -42,7 +42,7 @@ export default class Start extends Command {
 
   async checkToken(flags: any, ctx: any) {
     if (ctx.isAuthEnabled && !flags['access-token']) {
-      this.error('E_AUTH_REQUIRED - Che authentication is enabled and an access token need to be provided (flag --access-token).')
+      this.error('E_AUTH_REQUIRED - Eclipse Che authentication is enabled and an access token need to be provided (flag --access-token).')
     }
   }
 
@@ -57,17 +57,17 @@ export default class Start extends Command {
     }
     const tasks = new Listr([
       {
-        title: 'Retrieving Che Server URL',
+        title: 'Retrieving Eclipse Che Server URL',
         task: async (ctx: any, task: any) => {
           ctx.cheURL = await che.cheURL(flags.chenamespace)
           task.title = await `${task.title}...${ctx.cheURL}`
         }
       },
       {
-        title: 'Verify if Che server is running',
+        title: 'Verify if Eclipse Che server is running',
         task: async (ctx: any, task: any) => {
           if (!await che.isCheServerReady(ctx.cheURL)) {
-            this.error(`E_SRV_NOT_RUNNING - Che Server is not available by ${ctx.cheURL}`, { code: 'E_SRV_NOT_RUNNNG' })
+            this.error(`E_SRV_NOT_RUNNING - Eclipse Che Server is not available by ${ctx.cheURL}`, { code: 'E_SRV_NOT_RUNNNG' })
           }
           const status = await che.getCheServerStatus(ctx.cheURL)
           ctx.isAuthEnabled = await che.isAuthenticationEnabled(ctx.cheURL)
diff --git a/src/commands/workspace/stop.ts b/src/commands/workspace/stop.ts
index 277f4562b..ab36187f1 100644
--- a/src/commands/workspace/stop.ts
+++ b/src/commands/workspace/stop.ts
@@ -13,7 +13,7 @@ import { Command, flags } from '@oclif/command'
 import { accessToken, cheNamespace, listrRenderer } from '../../common-flags'
 
 export default class Stop extends Command {
-  static description = 'stop a running Che workspace'
+  static description = 'stop a running workspace'
 
   static flags = {
     help: flags.help({ char: 'h' }),
@@ -28,7 +28,7 @@ export default class Stop extends Command {
     const notifier = require('node-notifier')
     const tasks = new Listr([
       { title: 'Verify if we can access Kubernetes API', skip: () => 'Not implemented yet', task: () => { } },
-      { title: 'Verify if Che is responding', skip: () => 'Not implemented yet', task: () => { } },
+      { title: 'Verify if Eclipse Che is responding', skip: () => 'Not implemented yet', task: () => { } },
       { title: 'Verify if the workspaces is running', skip: () => 'Not implemented yet', task: () => { } },
       { title: 'Stop the workspace', skip: () => 'Not implemented yet', task: () => { } },
       { title: 'Waiting for the workspace resources to be deleted', skip: () => 'Not implemented yet', task: () => { } },
diff --git a/src/common-flags.ts b/src/common-flags.ts
index 43dc98c1f..c288e70a6 100644
--- a/src/common-flags.ts
+++ b/src/common-flags.ts
@@ -11,13 +11,13 @@ import { string } from '@oclif/parser/lib/flags'
 
 export const cheNamespace = string({
   char: 'n',
-  description: 'Kubernetes namespace where Che server is supposed to be deployed',
+  description: 'Kubernetes namespace where Eclipse Che server is supposed to be deployed',
   default: 'che',
   env: 'CHE_NAMESPACE'
 })
 
 export const cheDeployment = string({
-  description: 'Che deployment name',
+  description: 'Eclipse Che deployment name',
   default: 'che',
   env: 'CHE_DEPLOYMENT'
 })
@@ -29,6 +29,6 @@ export const listrRenderer = string({
 })
 
 export const accessToken = string({
-  description: 'Che OIDC Access Token',
+  description: 'Eclipse Che OIDC Access Token',
   env: 'CHE_ACCESS_TOKEN'
 })
diff --git a/src/tasks/che.ts b/src/tasks/che.ts
index 7b599d86b..7ec952c38 100644
--- a/src/tasks/che.ts
+++ b/src/tasks/che.ts
@@ -17,7 +17,7 @@ import { OpenShiftHelper } from '../api/openshift'
 import { KubeTasks } from './kube'
 
 /**
- * Holds tasks to work with Che component.
+ * Holds tasks to work with Eclipse Che component.
  */
 export class CheTasks {
   kube: KubeHelper
@@ -55,9 +55,9 @@ export class CheTasks {
   }
 
   /**
-   * Returns tasks list that waits until every Che component will be started.
+   * Returns tasks list that waits until every Eclipse Che component will be started.
    *
-   * Note that Che components statuses should be already set in context.
+   * Note that Eclipse Che components statuses should be already set in context.
    *
    * @see che.checkIfCheIsInstalledTasks
    */
@@ -84,26 +84,26 @@ export class CheTasks {
         task: () => this.kubeTasks.podStartTasks(command, this.pluginRegistrySelector, this.cheNamespace)
       },
       {
-        title: 'Che pod bootstrap',
+        title: 'Eclipse Che pod bootstrap',
         enabled: ctx => !ctx.isCheReady,
         task: () => this.kubeTasks.podStartTasks(command, this.cheSelector, this.cheNamespace)
       },
       {
-        title: 'Retrieving Che Server URL',
+        title: 'Retrieving Eclipse Che Server URL',
         task: async (ctx: any, task: any) => {
           ctx.cheURL = await this.che.cheURL(flags.chenamespace)
           task.title = await `${task.title}...${ctx.cheURL}`
         }
       },
       {
-        title: 'Che status check',
+        title: 'Eclipse Che status check',
         task: async ctx => this.che.isCheServerReady(ctx.cheURL)
       }
     ]
   }
 
   /**
-   * Returns list of tasks that checks if Che is already installed.
+   * Returns list of tasks that checks if Eclipse Che is already installed.
    *
    * After executing the following properties are set in context:
    * is[Component]Deployed, is[Component]Stopped, is[Component]Ready
@@ -112,10 +112,10 @@ export class CheTasks {
   checkIfCheIsInstalledTasks(_flags: any, command: Command): ReadonlyArray<Listr.ListrTask> {
     return [
       {
-        title: `Verify if Che is deployed into namespace \"${this.cheNamespace}\"`,
+        title: `Verify if Eclipse Che is deployed into namespace \"${this.cheNamespace}\"`,
         task: async (ctx: any, task: any) => {
           if (await this.kube.deploymentExist(this.cheDeploymentName, this.cheNamespace)) {
-            // helm chart and Che operator use a deployment
+            // helm chart and Che Operator use a deployment
             ctx.isCheDeployed = true
             ctx.isCheReady = await this.kube.deploymentReady(this.cheDeploymentName, this.cheNamespace)
             if (!ctx.isCheReady) {
@@ -189,7 +189,7 @@ export class CheTasks {
         }
       },
       {
-        title: 'Check Che server status',
+        title: 'Check Eclipse Che server status',
         enabled: (ctx: any) => ctx.isCheDeployed && ctx.isCheReady,
         task: async (ctx: any, task: any) => {
           let cheURL = ''
@@ -200,7 +200,7 @@ export class CheTasks {
             const auth = ctx.isAuthEnabled ? '(auth enabled)' : '(auth disabled)'
             task.title = `${task.title}...${status} ${auth}`
           } catch (error) {
-            command.error(`E_CHECK_CHE_STATUS_FAIL - Failed to check Che status (URL: ${cheURL}). ${error.message}`)
+            command.error(`E_CHECK_CHE_STATUS_FAIL - Failed to check Eclipse Che status (URL: ${cheURL}). ${error.message}`)
           }
         }
       }
@@ -208,7 +208,7 @@ export class CheTasks {
   }
 
   /**
-   * Returns tasks list which scale down all Che components which are deployed.
+   * Returns tasks list which scale down all Eclipse Che components which are deployed.
    * It requires {@link this#checkIfCheIsInstalledTasks} to be executed before.
    *
    * @see [CheTasks](#checkIfCheIsInstalledTasks)
@@ -216,7 +216,7 @@ export class CheTasks {
   scaleCheUpTasks(_command: Command): ReadonlyArray<Listr.ListrTask> {
     return [
       {
-        title: 'Scaling up Che Deployments',
+        title: 'Scaling up Eclipse Che Deployments',
         enabled: (ctx: any) => ctx.isCheDeployed,
         task: async (ctx: any, task: any) => {
           if (ctx.isPostgresDeployed) {
@@ -236,7 +236,7 @@ export class CheTasks {
         }
       },
       {
-        title: `Che is already running in namespace \"${this.cheNamespace}\".`,
+        title: `Eclipse Che is already running in namespace \"${this.cheNamespace}\".`,
         enabled: (ctx: any) => (ctx.isCheDeployed && ctx.isCheAvailable),
         task: async (ctx: any, task: any) => {
           ctx.cheDeploymentExist = true
@@ -249,18 +249,18 @@ export class CheTasks {
   }
 
   /**
-   * Returns tasks list which scale down all Che components which are deployed.
+   * Returns tasks list which scale down all Eclipse Che components which are deployed.
    * It requires {@link this#checkIfCheIsInstalledTasks} to be executed before.
    *
    * @see [CheTasks](#checkIfCheIsInstalledTasks)
    */
   scaleCheDownTasks(command: Command): ReadonlyArray<Listr.ListrTask> {
     return [{
-      title: 'Stop Che server and wait until it\'s ready to shutdown',
+      title: 'Stop Eclipse Che server and wait until it\'s ready to shutdown',
       enabled: (ctx: any) => !ctx.isCheStopped,
       task: async (ctx: any, task: any) => {
         if (ctx.isAuthEnabled && !this.cheAccessToken) {
-          command.error('E_AUTH_REQUIRED - Che authentication is enabled and an access token need to be provided (flag --access-token).\nFor instructions to retrieve a valid access token refer to https://www.eclipse.org/che/docs/che-6/authentication.html')
+          command.error('E_AUTH_REQUIRED - Eclipse Che authentication is enabled and an access token need to be provided (flag --access-token).\nFor instructions to retrieve a valid access token refer to https://www.eclipse.org/che/docs/che-6/authentication.html')
         }
         try {
           const cheURL = await this.che.cheURL(this.cheNamespace)
@@ -268,7 +268,7 @@ export class CheTasks {
           await this.che.waitUntilReadyToShutdown(cheURL)
           task.title = await `${task.title}...done`
         } catch (error) {
-          command.error(`E_SHUTDOWN_CHE_SERVER_FAIL - Failed to shutdown Che server. ${error.message}`)
+          command.error(`E_SHUTDOWN_CHE_SERVER_FAIL - Failed to shutdown Eclipse Che server. ${error.message}`)
         }
       }
     },
@@ -285,7 +285,7 @@ export class CheTasks {
       }
     },
     {
-      title: 'Wait until Che pod is deleted',
+      title: 'Wait until Eclipse Che pod is deleted',
       enabled: (ctx: any) => !ctx.isCheStopped,
       task: async (_ctx: any, task: any) => {
         await this.kube.waitUntilPodIsDeleted(this.cheSelector, this.cheNamespace)
@@ -375,7 +375,7 @@ export class CheTasks {
   }
 
   /**
-   * Returns tasks which remove all Che related resources.
+   * Returns tasks which remove all Eclipse Che related resources.
    */
   deleteTasks(flags: any): ReadonlyArray<Listr.ListrTask> {
     return [
@@ -470,7 +470,7 @@ export class CheTasks {
       title: `Verify if namespace ${flags.chenamespace} exists`,
       task: async () => {
         if (!await this.che.cheNamespaceExist(flags.chenamespace)) {
-          command.error(`E_BAD_NS - Namespace does not exist.\nThe Kubernetes Namespace "${flags.chenamespace}" doesn't exist. The configuration cannot be injected.\nFix with: verify the namespace where Che workspace is running (kubectl get --all-namespaces deployment | grep workspace)`, { code: 'EBADNS' })
+          command.error(`E_BAD_NS - Namespace does not exist.\nThe Kubernetes Namespace "${flags.chenamespace}" doesn't exist. The configuration cannot be injected.\nFix with: verify the namespace where workspace is running (kubectl get --all-namespaces deployment | grep workspace)`, { code: 'EBADNS' })
         }
       }
     }]
@@ -494,7 +494,7 @@ export class CheTasks {
   serverLogsTasks(flags: any, follow: boolean): ReadonlyArray<Listr.ListrTask> {
     return [
       {
-        title: `${follow ? 'Start following' : 'Read'} Che logs`,
+        title: `${follow ? 'Start following' : 'Read'} Eclipse Che logs`,
         task: async (ctx: any, task: any) => {
           await this.che.readPodLog(flags.chenamespace, this.cheSelector, ctx.directory, follow)
           task.title = await `${task.title}...done`
diff --git a/src/tasks/installers/installer.ts b/src/tasks/installers/installer.ts
index 10d0b9812..63797be3c 100644
--- a/src/tasks/installers/installer.ts
+++ b/src/tasks/installers/installer.ts
@@ -75,26 +75,26 @@ export class InstallerTasks {
 
     // let task: Listr.ListrTask
     if (flags.installer === 'helm') {
-      title = '🏃‍  Running Helm to install Che'
+      title = '🏃‍  Running Helm to install Eclipse Che'
       task = () => helmTasks.startTasks(flags, command)
     } else if (flags.installer === 'operator') {
       title = '🏃‍  Running the Che Operator'
       task = () => {
-        // The operator installs Che multiuser only
+        // The operator installs Eclipse Che multiuser only
         if (!flags.multiuser) {
-          command.warn("Che will be deployed in Multi-User mode since Configured 'operator' installer which support only such.")
+          command.warn("Eclipse Che will be deployed in Multi-User mode since Configured 'operator' installer which support only such.")
           flags.multiuser = true
         }
 
         return operatorTasks.startTasks(flags, command)
       }
     } else if (flags.installer === 'minishift-addon') {
-      // minishift-addon supports Che singleuser only
+      // minishift-addon supports Eclipse Che singleuser only
       if (flags.multiuser) {
-        command.warn("Che will be deployed in Single-User mode since Configured 'minishift-addon' installer which support only such.")
+        command.warn("Eclipse Che will be deployed in Single-User mode since Configured 'minishift-addon' installer which support only such.")
         flags.multiuser = false
       }
-      title = '🏃‍  Running the Che minishift-addon'
+      title = '🏃‍  Running the Eclipse Che minishift-addon'
       task = () => minishiftAddonTasks.startTasks(flags, command)
     } else {
       title = '🏃‍  Installer preflight check'
diff --git a/src/tasks/installers/operator.ts b/src/tasks/installers/operator.ts
index 22c689631..6da131f02 100644
--- a/src/tasks/installers/operator.ts
+++ b/src/tasks/installers/operator.ts
@@ -163,7 +163,7 @@ export class OperatorTasks {
         }
       },
       {
-        title: `Create Che Cluster ${this.operatorCheCluster} in namespace ${flags.chenamespace}`,
+        title: `Create Eclipse Che Cluster ${this.operatorCheCluster} in namespace ${flags.chenamespace}`,
         task: async (ctx: any, task: any) => {
           const exist = await kube.cheClusterExist(this.operatorCheCluster, flags.chenamespace)
           if (exist) {
@@ -195,7 +195,7 @@ export class OperatorTasks {
         task: async (ctx: any, _task: any) => {
           const operatorDeployment = await kube.getDeployment(this.operatorName, flags.chenamespace)
           if (!operatorDeployment) {
-            command.error(`${this.operatorName} deployment is not found in namespace ${flags.chenamespace}.\nProbably Che was initially deployed with another installer`)
+            command.error(`${this.operatorName} deployment is not found in namespace ${flags.chenamespace}.\nProbably Eclipse Che was initially deployed with another installer`)
             return
           }
           const deployedCheOperator = this.retrieveContainerImage(operatorDeployment)
@@ -302,7 +302,7 @@ export class OperatorTasks {
         }
       },
       {
-        title: `Updating Che Cluster CRD ${this.cheClusterCrd}`,
+        title: `Updating Eclipse Che Cluster CRD ${this.cheClusterCrd}`,
         task: async (_ctx: any, task: any) => {
           const crd = await kube.getCrd(this.cheClusterCrd)
           const yamlFilePath = this.resourcesPath + 'crds/org_v1_che_crd.yaml'
@@ -350,7 +350,7 @@ export class OperatorTasks {
   }
 
   /**
-   * Returns list of tasks which remove che operator related resources
+   * Returns list of tasks which remove Che Operator related resources
    */
   deleteTasks(flags: any): ReadonlyArray<Listr.ListrTask> {
     let kh = new KubeHelper(flags)
diff --git a/test/api/che.test.ts b/test/api/che.test.ts
index 9f62a6eca..0b1700be1 100644
--- a/test/api/che.test.ts
+++ b/test/api/che.test.ts
@@ -236,7 +236,7 @@ describe('Che helper', () => {
       .stub(kc, 'makeApiClient', () => k8sApi)
       .stub(k8sApi, 'listNamespacedPod', () => ({ response: '', body: { items: [{ metadata: { labels: { 'che.workspace_id': workspace } } }, { metadata: { labels: { 'che.workspace_id': `${workspace}1` } } }] } }))
       .do(() => ch.getWorkspacePod(namespace))
-      .catch(/More than one pod with running workspace is found. Please, specify Che Workspace ID./)
+      .catch(/More than one pod with running workspace is found. Please, specify Workspace ID./)
       .it('should fail if no workspace ID was provided but several workspaces are found')
   })
   describe('isAuthenticationEnabled', () => {
diff --git a/test/commands/server/start.test.ts b/test/commands/server/start.test.ts
index 5727d399d..94a815fd6 100644
--- a/test/commands/server/start.test.ts
+++ b/test/commands/server/start.test.ts
@@ -13,7 +13,7 @@ describe('start', () => {
   test
     .stdout()
     .command(['start'])
-    .it('starts Che Server', ctx => {
+    .it('starts Eclipse Che Server', ctx => {
       expect(ctx.stdout).to.contain('Successfully started')
     })
 })
diff --git a/test/commands/server/stop.test.ts b/test/commands/server/stop.test.ts
index f32b5fb94..b3c3499ae 100644
--- a/test/commands/server/stop.test.ts
+++ b/test/commands/server/stop.test.ts
@@ -13,7 +13,7 @@ describe('stop', () => {
   test
     .stdout()
     .command(['stop'])
-    .it('stop Che Server', ctx => {
+    .it('stop Eclipse Che Server', ctx => {
       expect(ctx.stdout).to.contain('Successfully stopped')
     })
 })