diff --git a/controlpanel/api/models/tool.py b/controlpanel/api/models/tool.py
index ee1f7a836..32243f1e1 100644
--- a/controlpanel/api/models/tool.py
+++ b/controlpanel/api/models/tool.py
@@ -24,7 +24,7 @@ class Tool(TimeStampedModel):
     # chart name match: tool bucket
     TOOL_BOX_CHART_LOOKUP = {"jupyter": "jupyter-lab",
                              "rstudio": "rstudio",
-                             "vscode": "vscode"}
+                             "visual-studio-code": "visual-studio-code"}
 
     description = models.TextField(blank=True)
     chart_name = models.CharField(max_length=100, blank=False)
diff --git a/controlpanel/frontend/forms.py b/controlpanel/frontend/forms.py
index ea4a249a0..017ea538d 100644
--- a/controlpanel/frontend/forms.py
+++ b/controlpanel/frontend/forms.py
@@ -470,7 +470,7 @@ def clean_chart_name(self):
             "airflow-sqlite",
             "jupyter-",
             "rstudio",
-            "vscode"
+            "visual-studio-code"
         ]
         value = self.cleaned_data["chart_name"]
         is_valid = False
@@ -493,7 +493,7 @@ def clean_tool_domain(self):
             "airflow-sqlite",
             "jupyter-lab",
             "rstudio",
-            "vscode"
+            "visual-studio-code"
         ]
         value = self.cleaned_data.get("tool_domain")
         if value and value not in valid_names:
diff --git a/controlpanel/frontend/jinja2/release-create.html b/controlpanel/frontend/jinja2/release-create.html
index 770b3f726..42f10e8f0 100644
--- a/controlpanel/frontend/jinja2/release-create.html
+++ b/controlpanel/frontend/jinja2/release-create.html
@@ -45,7 +45,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
       },
       "classes": "govuk-!-width-two-thirds",
       "hint": {
-        "text": 'Helm chart name. Use only variations of: airflow-sqlite, jupyter-*, rstudio or vscode'
+        "text": 'Helm chart name. Use only variations of: airflow-sqlite, jupyter-*, rstudio or visual-studio-code'
       },
       "name": "chart_name",
       "attributes": {
@@ -95,7 +95,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
       },
       "classes": "govuk-!-width-two-thirds",
       "hint": {
-        "text": 'If the chart name is non-standard, use this value in the domain name for the tool. Use only one of: airflow-sqlite, jupyter-lab, rstudio or vscode.'
+        "text": 'If the chart name is non-standard, use this value in the domain name for the tool. Use only one of: airflow-sqlite, jupyter-lab, rstudio or visual-studio-code.'
       },
       "name": "tool_domain",
       "attributes": {
diff --git a/controlpanel/frontend/jinja2/release-detail.html b/controlpanel/frontend/jinja2/release-detail.html
index 7c73873c3..c9b497ceb 100644
--- a/controlpanel/frontend/jinja2/release-detail.html
+++ b/controlpanel/frontend/jinja2/release-detail.html
@@ -48,7 +48,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
       },
       "classes": "govuk-!-width-two-thirds",
       "hint": {
-        "text": 'Helm chart name. Use only variations of: airflow-sqlite, jupyter-*, rstudio or vscode'
+        "text": 'Helm chart name. Use only variations of: airflow-sqlite, jupyter-*, rstudio or visual-studio-code'
       },
       "name": "chart_name",
       "attributes": {
@@ -98,7 +98,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
       },
       "classes": "govuk-!-width-two-thirds",
       "hint": {
-        "text": 'If the chart name is non-standard, use this value in the domain name for the tool. Use only one of: airflow-sqlite, jupyter-lab, rstudio or vscode.'
+        "text": 'If the chart name is non-standard, use this value in the domain name for the tool. Use only one of: airflow-sqlite, jupyter-lab, rstudio or visual-studio-code.'
       },
       "name": "tool_domain",
       "attributes": {
diff --git a/tests/frontend/test_forms.py b/tests/frontend/test_forms.py
index 755becbd9..bc3cfcec8 100644
--- a/tests/frontend/test_forms.py
+++ b/tests/frontend/test_forms.py
@@ -57,7 +57,7 @@ def test_tool_release_form_check_release_name():
     assert f.is_valid()
     data = {
         "name": "Test Release",
-        "chart_name": "vscode",
+        "chart_name": "visual-studio-code",
         "version": "1.2.3",
         "values": {"foo": "bar"},
         "is_restricted": False,
@@ -102,11 +102,11 @@ def test_tool_release_form_check_tool_domain():
     assert f.is_valid()
     data = {
         "name": "Test Release",
-        "chart_name": "vscode",
+        "chart_name": "visual-studio-code",
         "version": "1.2.3",
         "values": {"foo": "bar"},
         "is_restricted": False,
-        "tool_domain": "vscode",
+        "tool_domain": "visual-studio-code",
     }
     f = forms.ToolReleaseForm(data)
     assert f.is_valid()