diff --git a/README.md b/README.md
index 65e33d5..03a50d8 100644
--- a/README.md
+++ b/README.md
@@ -89,10 +89,10 @@ You can simply run the whole role:
       tasks_from: usertools
 
   # install programming languages and optionally VS Code
-  - name: Basics - Install and configure VS Code
+  - name: Basics - Install and configure development env (and VS Code)
     import_role:
       name: common
-      tasks_from: vscode
+      tasks_from: devel
 ```
 
 Or call the different tasks individually:
diff --git a/tasks/vscode-Archlinux.yml b/tasks/devel-Archlinux.yml
similarity index 70%
rename from tasks/vscode-Archlinux.yml
rename to tasks/devel-Archlinux.yml
index 0834cde..395344b 100644
--- a/tasks/vscode-Archlinux.yml
+++ b/tasks/devel-Archlinux.yml
@@ -1,5 +1,5 @@
 ---
-# Common/VSCode: Install and Configure VS Code - ArchLinux Version
+# Common/Devel: Install and Configure Dev Env - ArchLinux Version
 
 # Install Visual Studio Code and Set Basic Configuration
 - name: vscode - Basics
@@ -17,10 +17,10 @@
         dest: ~/.config/Code/User/settings.json
   when: user_vscode == true
 
-# VS Code - C/C++ Development Tools
-- name: vscode - C/C++
+# Dev Env - C/C++ Development Tools
+- name: devel - C/C++
   block:
-    - name: vscode - C/C++ - Install developer tools
+    - name: devel - C/C++ - Install developer tools
       package:
         name: "{{ packages }}"
         state: present
@@ -29,13 +29,13 @@
           - clang-format
   when: user_lang_cpp == true
 
-# VS Code - Python Development Tools
+# Dev Env - Python Development Tools
 # all done in vscode.yml
 
-# VS Code - Golang Development Tools
-- name: vscode - Golang
+# Dev Env - Golang Development Tools
+- name: devel - Golang
   block:
-    - name: vscode - Golang - Install developer tools
+    - name: devel - Golang - Install developer tools
       package:
         name: "{{ packages }}"
         state: present
diff --git a/tasks/vscode-Darwin.yml b/tasks/devel-Darwin.yml
similarity index 71%
rename from tasks/vscode-Darwin.yml
rename to tasks/devel-Darwin.yml
index 63f1e87..749eb6e 100644
--- a/tasks/vscode-Darwin.yml
+++ b/tasks/devel-Darwin.yml
@@ -1,5 +1,5 @@
 ---
-# Common/VSCode: Install and Configure VS Code - macOS Version
+# Common/Devel: Install and Configure Dev Env - macOS Version
 
 # Install Visual Studio Code and Set Basic Configuration
 - name: vscode - Basics
@@ -17,10 +17,10 @@
         dest: ~/Library/Application Support/Code/User/settings.json
   when: user_vscode == true
 
-# VS Code - C/C++ Development Tools
-- name: vscode - C/C++
+# Dev Env - C/C++ Development Tools
+- name: devel - C/C++
   block:
-    - name: vscode - C/C++ - Install developer tools
+    - name: devel - C/C++ - Install developer tools
       homebrew:
         name: "{{ packages }}"
         state: present
@@ -29,13 +29,13 @@
           - clang-format
   when: user_lang_cpp == true
 
-# VS Code - Python Development Tools
+# Dev Env - Python Development Tools
 # all done in vscode.yml
 
-# VS Code - Golang Development Tools
-- name: vscode - Golang
+# Dev Env - Golang Development Tools
+- name: devel - Golang
   block:
-    - name: vscode - Golang - Install developer tools
+    - name: devel - Golang - Install developer tools
       homebrew:
         name: "{{ packages }}"
         state: present
diff --git a/tasks/vscode-Debian.yml b/tasks/devel-Debian.yml
similarity index 72%
rename from tasks/vscode-Debian.yml
rename to tasks/devel-Debian.yml
index c2e32d6..1b24431 100644
--- a/tasks/vscode-Debian.yml
+++ b/tasks/devel-Debian.yml
@@ -1,5 +1,5 @@
 ---
-# Common/VSCode: Install and Configure VS Code - Debian Version
+# Common/Devel: Install and Configure Dev Env - Debian Version
 
 # Install Visual Studio Code and Set Basic Configuration
 - name: vscode - Basics
@@ -18,10 +18,10 @@
         dest: ~/.config/Code/User/settings.json
   when: user_vscode == true
 
-# VS Code - C/C++ Development Tools
-- name: vscode - C/C++
+# Dev Env - C/C++ Development Tools
+- name: devel - C/C++
   block:
-    - name: vscode - C/C++ - Install developer tools
+    - name: devel - C/C++ - Install developer tools
       become: yes
       package:
         name: "{{ packages }}"
@@ -31,13 +31,13 @@
           - clang-format
   when: user_lang_cpp == true
 
-# VS Code - Python Development Tools
+# Dev Env - Python Development Tools
 # all done in vscode.yml
 
-# VS Code - Golang Development Tools
-- name: vscode - Golang
+# Dev Env - Golang Development Tools
+- name: devel - Golang
   block:
-    - name: vscode - Golang - Install developer tools
+    - name: devel - Golang - Install developer tools
       become: yes
       apt:
         name: "{{ packages }}"
diff --git a/tasks/vscode.yml b/tasks/devel.yml
similarity index 90%
rename from tasks/vscode.yml
rename to tasks/devel.yml
index 1bd70aa..45d67ab 100644
--- a/tasks/vscode.yml
+++ b/tasks/devel.yml
@@ -1,5 +1,5 @@
 ---
-# Common/VSCode: Install and Configure VS Code
+# Common/Devel: Install and Configure Dev Environment (optionally VS Code)
 # - Installs VS Code, if user_vscode is set
 # - Installs development tools, if the corresponding variable is set
 #   but will not try to configure VS Code, if user_vscode is not set.
@@ -60,23 +60,23 @@
 
 # VC Code - Golang Development Tools
 # https://golang.org/doc/install
-- name: vscode - Golang - Setup Environment
+- name: devel - Golang - Setup Environment
   block:
-    - name: vscode - Golang - Create workspace directory
+    - name: devel - Golang - Create workspace directory
       file:
         path: "{{ user_lang_golang_gopath }}"
         state: directory
-    - name: vscode - Golang - Create zshrc-host
+    - name: devel - Golang - Create zshrc-host
       file:
         path: "{{ ansible_user_dir}}/.zshrc-host"
         state: touch
-    - name: vscode - Golang - Add GOPATH
+    - name: devel - Golang - Add GOPATH
       lineinfile:
         path: "{{ ansible_user_dir}}/.zshrc-host"
         line: "export GOPATH={{ user_lang_golang_gopath }}"
         state: present
         backup: yes
-    - name: vscode - Golang - Add go bin to PATH
+    - name: devel - Golang - Add go bin to PATH
       lineinfile:
         path: "{{ ansible_user_dir}}/.zshrc-host"
         line: "export PATH=$PATH:{{ user_lang_golang_gopath }}/bin"