diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.md b/.github/ISSUE_TEMPLATE/1_bug_report.md
index 6048fb97a4..336d1b2908 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.md
@@ -8,13 +8,10 @@ labels: bug
 
 ## Environment data
 
--   VS Code version: XXX
--   Jupyter Extension version (available under the Extensions sidebar): XXX
--   Python Extension version (available under the Extensions sidebar): XXX
--   OS (Windows | Mac | Linux distro) and version: XXX
--   Python and/or Anaconda version: XXX
--   Type of virtual environment used (N/A | venv | virtualenv | conda | ...): XXX
--   Jupyter server running: Local | Remote | N/A
+- VS Code version: XXX
+- Deepnote Extension version (available under the Extensions sidebar): XXX
+- OS (Windows | Mac | Linux distro) and version: XXX
+- Python and/or Anaconda version: XXX
 
 ## Expected behaviour
 
@@ -38,7 +35,7 @@ Note: If you think a GIF of what is happening would be helpful, consider tools l
 
 <details>
 
-<summary>Output for <code>Jupyter</code> in the <code>Output</code> panel (<code>View</code>→<code>Output</code>, change the drop-down the upper-right of the <code>Output</code> panel to <code>Jupyter</code>)
+<summary>Output for <code>Deepnote</code> in the <code>Output</code> panel (<code>View</code>→<code>Output</code>, change the drop-down the upper-right of the <code>Output</code> panel to <code>Deepnote</code>)
 </summary>
 
 <p>
diff --git a/.github/ISSUE_TEMPLATE/2_bug_form.yml b/.github/ISSUE_TEMPLATE/2_bug_form.yml
index 2c4b17578c..09384f3b13 100644
--- a/.github/ISSUE_TEMPLATE/2_bug_form.yml
+++ b/.github/ISSUE_TEMPLATE/2_bug_form.yml
@@ -19,7 +19,7 @@ body:
     attributes:
       label: Applies To
       options:
-        - label: Notebooks (.ipynb files)
+        - label: Notebooks (.deepnote files)
         - label: Interactive Window and\/or Cell Scripts (.py files with \#%% markers)
   - type: textarea
     id: what-happened
@@ -36,17 +36,17 @@ body:
     validations:
       required: true
   - type: input
-    id: jupyter-version
+    id: deepnote-version
     attributes:
-      label: Jupyter Extension Version
+      label: Deepnote Extension Version
       description: The version can be found at the top of the extension's description in the extensions sidebar.
     validations:
       required: true
   - type: textarea
     id: logs
     attributes:
-      label: Jupyter logs
-      description: Copy and paste all of the text in the Jupyter Output panel available via the ```Jupyter Show Output``` command. This is often critical to help us understand and fix what may have gone wrong!
+      label: Deepnote logs
+      description: Copy and paste all of the text in the Deepnote Output panel available via the ```Deepnote Show Output``` command. This is often critical to help us understand and fix what may have gone wrong!
       render: shell
   - type: markdown
     attributes:
@@ -57,22 +57,3 @@ body:
     attributes:
       label: Coding Language and Runtime Version
       placeholder: Python v3.8.2, vJulia 1.6, R, etc.
-  - type: input
-    id: lang-extension-version
-    attributes:
-      label: Language Extension Version (if applicable)
-      description: Ex. Python Extension. The extension version can be found at the top of the extension's description in the extensions sidebar.
-  - type: input
-    id: anaconda-version
-    attributes:
-      label: Anaconda Version (if applicable)
-      description: If applicable, what version of the Anaconda are you using?
-  - type: dropdown
-    id: local-remote
-    attributes:
-      label: Running Jupyter locally or remotely?
-      multiple:
-      options:
-        - Local
-        - Remote
-        - N/A or Not sure
diff --git a/package.json b/package.json
index e3e38b2e96..c93c4465b3 100644
--- a/package.json
+++ b/package.json
@@ -345,7 +345,7 @@
             {
                 "command": "deepnote.viewOutput",
                 "title": "%deepnote.command.deepnote.viewOutput.title%",
-                "category": "Jupyter"
+                "category": "Deepnote"
             },
             {
                 "command": "deepnote.notebookeditor.export",