diff --git a/aiida/cmdline/commands/cmd_computer.py b/aiida/cmdline/commands/cmd_computer.py
index 3d83d66bd6..0ca30081c5 100644
--- a/aiida/cmdline/commands/cmd_computer.py
+++ b/aiida/cmdline/commands/cmd_computer.py
@@ -338,7 +338,7 @@ def computer_disable(computer, user):
 
 @verdi_computer.command('list')
 @options.ALL(help='Show also disabled or unconfigured computers.')
-@options.RAW(help='Show only the computer names, one per line.')
+@options.RAW(help='Show only the computer labels, one per line.')
 @with_dbenv()
 def computer_list(all_entries, raw):
     """List all available computers."""
@@ -346,7 +346,7 @@ def computer_list(all_entries, raw):
 
     if not raw:
         echo.echo_info('List of configured computers')
-        echo.echo_info("Use 'verdi computer show COMPUTERNAME' to display more detailed information")
+        echo.echo_info("Use 'verdi computer show COMPUTERLABEL' to display more detailed information")
 
     computers = Computer.objects.all()
     user = User.objects.get_default()
@@ -357,7 +357,7 @@ def computer_list(all_entries, raw):
     sort = lambda computer: computer.label
     highlight = lambda comp: comp.is_user_configured(user) and comp.is_user_enabled(user)
     hide = lambda comp: not (comp.is_user_configured(user) and comp.is_user_enabled(user)) and not all_entries
-    echo.echo_formatted_list(computers, ['name'], sort=sort, highlight=highlight, hide=hide)
+    echo.echo_formatted_list(computers, ['label'], sort=sort, highlight=highlight, hide=hide)
 
 
 @verdi_computer.command('show')
diff --git a/environment.yml b/environment.yml
index f2a3bf75c2..71df1d2412 100644
--- a/environment.yml
+++ b/environment.yml
@@ -14,7 +14,7 @@ dependencies:
 - click-completion~=0.5.1
 - click-config-file~=0.6.0
 - click-spinner~=0.1.8
-- click~=7.0
+- click~=7.1
 - dataclasses~=0.7
 - django~=2.2
 - ete3~=3.1
diff --git a/requirements/requirements-py-3.6.txt b/requirements/requirements-py-3.6.txt
index 37f5d111a9..a0c58557cc 100644
--- a/requirements/requirements-py-3.6.txt
+++ b/requirements/requirements-py-3.6.txt
@@ -17,7 +17,7 @@ certifi==2019.11.28
 cffi==1.14.0
 chardet==3.0.4
 circus==0.17.1
-Click==7.0
+Click==7.1.2
 click-completion==0.5.2
 click-config-file==0.6.0
 click-spinner==0.1.8
diff --git a/requirements/requirements-py-3.7.txt b/requirements/requirements-py-3.7.txt
index 2b693de529..fe138a5333 100644
--- a/requirements/requirements-py-3.7.txt
+++ b/requirements/requirements-py-3.7.txt
@@ -17,7 +17,7 @@ certifi==2019.11.28
 cffi==1.14.0
 chardet==3.0.4
 circus==0.17.1
-Click==7.0
+Click==7.1.2
 click-completion==0.5.2
 click-config-file==0.6.0
 click-spinner==0.1.8
diff --git a/requirements/requirements-py-3.8.txt b/requirements/requirements-py-3.8.txt
index 930f300a2e..d026394a97 100644
--- a/requirements/requirements-py-3.8.txt
+++ b/requirements/requirements-py-3.8.txt
@@ -16,7 +16,7 @@ certifi==2019.11.28
 cffi==1.14.0
 chardet==3.0.4
 circus==0.17.1
-Click==7.0
+Click==7.1.2
 click-completion==0.5.2
 click-config-file==0.6.0
 click-spinner==0.1.8
diff --git a/setup.json b/setup.json
index 43dcbed5f8..79f25d1eb1 100644
--- a/setup.json
+++ b/setup.json
@@ -29,7 +29,7 @@
         "click-completion~=0.5.1",
         "click-config-file~=0.6.0",
         "click-spinner~=0.1.8",
-        "click~=7.0",
+        "click~=7.1",
         "dataclasses~=0.7; python_version < '3.7.0'",
         "django~=2.2",
         "ete3~=3.1",