diff --git a/README.md b/README.md
index 3e4c605..5594090 100644
--- a/README.md
+++ b/README.md
@@ -13,19 +13,19 @@ By default it will also add the [ETH Zürich Debian Packages Mirror](https://deb
 
 | variable | default value | useage |
 | --- | --- | --- |
-| ``l3d_pkgs__install_advanced`` | ``false`` | Install some advanced packages like tcpdump, mtr, fio and ethertools. See ``vars/main.yml`` for details |
-| ``l3d_pkgs__install_python`` | ``false`` | Install some Python packages like python3-pip. See ``vars/main.yml`` for details |
-| ``l3d_pkgs__install_cli`` | ``false`` | Install some CLI packages like htop, ranger and asciinema. See ``vars/main.yml`` for details |
-| ``l3d_pkgs__install_extra_packages`` | | List of additional packages to install |
-| ``l3d_pkgs__package_state`` | ``present`` | Package State, set to ``latest`` to upgrade packages managed by this role |
-| ``l3d_pkgs__upgrade_all`` | ``false`` | Can upgrade all packages if ``l3d_pkgs__package_state`` is to ``latest`` and the value is ``true`` |
-| ``l3d_pkgs__adding_ethz`` | ``true`` | Adding the swiss ETH package mirror |
-| ``l3d_pkgs__ethz_contrib`` | ``true`` | contrib packages contain DFSG-compliant software |
-| ``l3d_pkgs__ethz_non_free`` | ``true`` | non-free contains software that does not comply with the DFSG. |
-| ``l3d_pkgs__ethz_non_free_firmware`` | ``true`` | contains non-free-firmware packages |
-| ``l3d_pkgs__ethz_security`` | ``true`` | Inofficial Debian Security Mirror |
-| ``l3d_pkgs__ethz_updates`` | ``true`` | Updates Mirror |
-| ``l3d_pkgs__ethz__backports`` | ``true`` | Backports Mirror |
+| ``package__install_advanced`` | ``false`` | Install some advanced packages like tcpdump, mtr, fio and ethertools. See ``vars/main.yml`` for details |
+| ``package__install_python`` | ``false`` | Install some Python packages like python3-pip. See ``vars/main.yml`` for details |
+| ``package__install_cli`` | ``false`` | Install some CLI packages like htop, ranger and asciinema. See ``vars/main.yml`` for details |
+| ``package__install_extra_packages`` | | List of additional packages to install |
+| ``package__package_state`` | ``present`` | Package State, set to ``latest`` to upgrade packages managed by this role |
+| ``package__upgrade_all`` | ``false`` | Can upgrade all packages if ``package__package_state`` is to ``latest`` and the value is ``true`` |
+| ``package__adding_ethz`` | ``true`` | Adding the swiss ETH package mirror |
+| ``package__ethz_contrib`` | ``true`` | contrib packages contain DFSG-compliant software |
+| ``package__ethz_non_free`` | ``true`` | non-free contains software that does not comply with the DFSG. |
+| ``package__ethz_non_free_firmware`` | ``true`` | contains non-free-firmware packages |
+| ``package__ethz_security`` | ``true`` | Inofficial Debian Security Mirror |
+| ``package__ethz_updates`` | ``true`` | Updates Mirror |
+| ``package__ethz__backports`` | ``true`` | Backports Mirror |
 | ``submodules_versioncheck`` | ``false`` | Enable simple versioncheck to prevent running old versions of this role |
 
  Contributing
diff --git a/vars/main.yml b/vars/main.yml
index cc8a8f5..3ae22e5 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,6 @@
 ---
 # must-have packages for all systems
-l3d_pkgs__base:
+package__base:
   - rsync
   - tmux
   - sudo
@@ -16,7 +16,7 @@ l3d_pkgs__base:
   - lsof
   - pwgen
 
-l3d_pkgs__advanced:
+package__advanced:
   - tcpdump
   - sysstat
   - debian-goodies
@@ -31,12 +31,12 @@ l3d_pkgs__advanced:
   - python3-apt
   - ethstatus
 
-l3d_pkgs__python:
+package__python:
   - python3-pip
   - python3-dev
   - python3
 
-l3d_pkgs__cli:
+package__cli:
   - links
   - ranger
   - htop