diff --git a/roles/jupyter/defaults/main.yml b/roles/jupyterhub/defaults/main.yml
similarity index 77%
rename from roles/jupyter/defaults/main.yml
rename to roles/jupyterhub/defaults/main.yml
index b22730df0..d4231ae72 100644
--- a/roles/jupyter/defaults/main.yml
+++ b/roles/jupyterhub/defaults/main.yml
@@ -1,4 +1,4 @@
 notebook_dir: /opt/iiab/notebook
-jupyter_venv: /opt/iiab/jupyter 
+jupyterhub_venv: /opt/iiab/jupyter 
 jupyterhub_url: https://github.com/jupyterhub/the-littlest-jupyterhub
 jupyterhub_port: 8000
diff --git a/roles/jupyter/docs/README.md b/roles/jupyterhub/docs/README.md
similarity index 100%
rename from roles/jupyter/docs/README.md
rename to roles/jupyterhub/docs/README.md
diff --git a/roles/jupyter/tasks/enable-or-disable.yml b/roles/jupyterhub/tasks/enable-or-disable.yml
similarity index 69%
rename from roles/jupyter/tasks/enable-or-disable.yml
rename to roles/jupyterhub/tasks/enable-or-disable.yml
index becab8e9a..aacd9a35d 100644
--- a/roles/jupyter/tasks/enable-or-disable.yml
+++ b/roles/jupyterhub/tasks/enable-or-disable.yml
@@ -10,8 +10,8 @@
     enabled: yes
     state: restarted
   with_items:
-    - jupyter
-  when: jupyter_enabled
+    - jupyterhub.service
+  when: jupyterhub_enabled
 
 - name: Disable jupyterhub
   systemd:
@@ -19,21 +19,21 @@
     enabled: no
     state: stopped
   with_items:
-    - jupyter
-  when: not jupyter_enabled
+    - jupyterhub
+  when: not jupyterhub_enabled
 
 
 - name: Put the nginx config file in place
   template:
-    src: jupyter-nginx.conf
+    src: jupyterhub-nginx.conf
     dest: "{{ nginx_conf_dir }}/"
-  when: jupyter_enabled
+  when: jupyterhub_enabled
 
 - name: Disable jupyterhub
   file:
-    path: "{{ nginx_conf_dir }}/jupyter-nginx.conf"
+    path: "{{ nginx_conf_dir }}/jupyterhub-nginx.conf"
     state: absent
-  when: not jupyter_enabled
+  when: not jupyterhub_enabled
 
 - name: Restart 'nginx' systemd service
   systemd:
diff --git a/roles/jupyter/tasks/install.yml b/roles/jupyterhub/tasks/install.yml
similarity index 81%
rename from roles/jupyter/tasks/install.yml
rename to roles/jupyterhub/tasks/install.yml
index 6901db83d..baae04456 100644
--- a/roles/jupyter/tasks/install.yml
+++ b/roles/jupyterhub/tasks/install.yml
@@ -3,9 +3,9 @@
     state: directory
     path: '{{ item }}'
   with_items:
-     - '{{ jupyter_venv }}/etc/jupyter'
-     - '{{ jupyter_venv }}/etc/jupyterhub'
-     - '{{ jupyter_venv }}/etc/systemd'
+     - '{{ jupyterhub_venv }}/etc/jupyter'
+     - '{{ jupyterhub_venv }}/etc/jupyterhub'
+     - '{{ jupyterhub_venv }}/etc/systemd'
 
 - name: "Set 'nodejs_install: True' and 'nodejs_enabled: True'"
   set_fact:
@@ -37,7 +37,7 @@
        - jupyterlab
        - jupyterhub_firstuseauthenticator
        - jupyterhub-systemdspawner
-    virtualenv: "{{ jupyter_venv }}"    # /opt/iiab/jupyter
+    virtualenv: "{{ jupyterhub_venv }}"    # /opt/iiab/jupyter
     virtualenv_site_packages: no
     virtualenv_command: /usr/bin/virtualenv
     virtualenv_python: python3
@@ -47,9 +47,9 @@
 - name: Install the config file for jupyterhub
   template:
       src: jupyterhub_config.py
-      dest: '{{ jupyter_venv }}/etc/jupyterhub/'
+      dest: '{{ jupyterhub_venv }}/etc/jupyterhub/'
 
 - name: Use systemd to start jupyterhub
   template:
-      src: jupyter.service
+      src: jupyterhub.service
       dest: /etc/systemd/system/
diff --git a/roles/jupyter/tasks/main.yml b/roles/jupyterhub/tasks/main.yml
similarity index 66%
rename from roles/jupyter/tasks/main.yml
rename to roles/jupyterhub/tasks/main.yml
index 137a01b84..9090610a0 100644
--- a/roles/jupyter/tasks/main.yml
+++ b/roles/jupyterhub/tasks/main.yml
@@ -1,6 +1,6 @@
-- name: Install Jupyter if jupyter_installed not defined, e.g. in {{ iiab_state_file }}    # /etc/iiab/iiab_state.yml
+- name: Install Jupyter if jupyterhub_installed not defined, e.g. in {{ iiab_state_file }}    # /etc/iiab/iiab_state.yml
   include_tasks: install.yml
-  when: jupyter_installed is undefined
+  when: jupyterhub_installed is undefined
 
 
 - include_tasks: enable-or-disable.yml
@@ -18,6 +18,6 @@
     - option: description
       value: '"Raspberry Pi Jupyter python programming environment"'
     - option: install
-      value: "{{ jupyter_install }}"
+      value: "{{ jupyterhub_install }}"
     - option: enabled
-      value: "{{ jupyter_enabled }}"
+      value: "{{ jupyterhub_enabled }}"
diff --git a/roles/jupyter/templates/jupyter-nginx.conf b/roles/jupyterhub/templates/jupyterhub-nginx.conf
similarity index 100%
rename from roles/jupyter/templates/jupyter-nginx.conf
rename to roles/jupyterhub/templates/jupyterhub-nginx.conf
diff --git a/roles/jupyter/templates/jupyter.service b/roles/jupyterhub/templates/jupyterhub.service
similarity index 54%
rename from roles/jupyter/templates/jupyter.service
rename to roles/jupyterhub/templates/jupyterhub.service
index 8ce535369..3137d0404 100644
--- a/roles/jupyter/templates/jupyter.service
+++ b/roles/jupyterhub/templates/jupyterhub.service
@@ -4,8 +4,8 @@ After=syslog.target network.target
 
 [Service]
 User=root
-Environment="PATH=/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:{{ jupyter_venv }}/bin"
-ExecStart={{ jupyter_venv }}/bin/python3 -m jupyterhub -f {{ jupyter_venv }}/etc/jupyterhub/jupyterhub_config.py
+Environment="PATH=/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:{{ jupyterhub_venv }}/bin"
+ExecStart={{ jupyterhub_venv }}/bin/python3 -m jupyterhub -f {{ jupyterhub_venv }}/etc/jupyterhub/jupyterhub_config.py
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/jupyter/templates/jupyterhub_config.py b/roles/jupyterhub/templates/jupyterhub_config.py
similarity index 100%
rename from roles/jupyter/templates/jupyterhub_config.py
rename to roles/jupyterhub/templates/jupyterhub_config.py
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index d1fb036e1..c932b98a6 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -564,8 +564,8 @@ phpmyadmin_enabled: False
 vnstat_install: False
 vnstat_enabled: False
 
-jupyter_install: False
-jupyter_enabled: False
+jupyterhub_install: False
+jupyterhub_enabled: False
 
 # 9-LOCAL-ADDONS