diff --git a/form.yml.erb b/form.yml.erb
index 18dd77def0f02d4840e600867954d1106e512472..46ca0758c924e8d337a12ed075703bb929955fc2 100644
--- a/form.yml.erb
+++ b/form.yml.erb
@@ -44,7 +44,7 @@ attributes:
       # format:
       # module load example_module/VERSION example_module2
 
-  # Whether Conda extensions will be available within the Jupyter notebook
+  # Whether Conda extensions will be available within the JupyterLab
   # server
   #
   # @note Allows the user to use conda environment-based kernels from their
@@ -56,8 +56,8 @@ attributes:
   # @see https://docs.continuum.io/anaconda/user-guide/tasks/use-jupyter-notebook-extensions
   conda_extensions: "1"
 
-  # Any extra command line arguments to feed to the `jupyter notebook ...`
-  # command that launches the Jupyter notebook within the batch job
+  # Any extra command line arguments to feed to the `jupyter-lab ...`
+  # command that launches the JupyterLab within the batch job
   extra_jupyter_args:
     widget: text_field
     label: Extra JupyterLab arguments
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 4866ebf56ba243f8b70e19a80f0f92147a418931..77357c1ffaa0b8b888eb947fb878ddc264524039 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -4,10 +4,10 @@
 cd "${HOME}"
 module reset
 #
-# Start Jupyter Notebook Server
+# Start JupyterLab Server
 #
 module load Anaconda3
 <%= context.custom_environment %>
 unset XDG_RUNTIME_DIR
-# Launch the Jupyter Notebook Server
+# Launch the JupyterLab Server
 jupyter-lab --config="${CONFIG_FILE}" <%= context.extra_jupyter_args %>