diff --git a/roles/application-caffeine/meta/main.yml b/roles/application-caffeine/meta/main.yml
index 09d965b4..f594a951 100644
--- a/roles/application-caffeine/meta/main.yml
+++ b/roles/application-caffeine/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - pc_system-aur-helper
+  - system-aur-helper
 galaxy_info:
   author: Kevin Veen-Birkenbach
   description: Ansible role for installing caffeine-ng and setting it to start at user login.
diff --git a/roles/application-latex/readme.md b/roles/application-latex/readme.md
index 39dc43fe..944af617 100644
--- a/roles/application-latex/readme.md
+++ b/roles/application-latex/readme.md
@@ -1,3 +1,3 @@
-# pc_application-latex
+# application-latex
 
 More packages you will find here: https://wiki.archlinux.org/title/TeX_Live
\ No newline at end of file
diff --git a/roles/application-libreoffice/meta/main.yml b/roles/application-libreoffice/meta/main.yml
index f4ec5601..acb10ca1 100644
--- a/roles/application-libreoffice/meta/main.yml
+++ b/roles/application-libreoffice/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_application-hunspell
+- application-hunspell
diff --git a/roles/application-msi-keyboard-color/README.md b/roles/application-msi-keyboard-color/README.md
index 4a0a9dff..69f9e875 100644
--- a/roles/application-msi-keyboard-color/README.md
+++ b/roles/application-msi-keyboard-color/README.md
@@ -20,7 +20,7 @@ The `vendor_and_product_id` variable is required and should be set to the vendor
 
 ## Dependencies
 
-- `pc_system-aur-helper`
+- `system-aur-helper`
 
 ## Example Playbook
 
diff --git a/roles/application-msi-keyboard-color/meta/main.yml b/roles/application-msi-keyboard-color/meta/main.yml
index f4d06f73..008ee9b4 100644
--- a/roles/application-msi-keyboard-color/meta/main.yml
+++ b/roles/application-msi-keyboard-color/meta/main.yml
@@ -8,5 +8,5 @@ galaxy_info:
       versions:
         - all
 dependencies:
-  - pc_system-aur-helper
+  - system-aur-helper
   - systemd_notifier
diff --git a/roles/application-ssh/meta/main.yml b/roles/application-ssh/meta/main.yml
index 633a8ce2..7caed099 100644
--- a/roles/application-ssh/meta/main.yml
+++ b/roles/application-ssh/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_git-client
\ No newline at end of file
+- git-client
\ No newline at end of file
diff --git a/roles/application-virtual-box/Readme.md b/roles/application-virtual-box/Readme.md
index b6488463..343eba11 100644
--- a/roles/application-virtual-box/Readme.md
+++ b/roles/application-virtual-box/Readme.md
@@ -1,4 +1,4 @@
-# pc_application-virtual-box
+# application-virtual-box
 
 ```bash
 	sudo pacman -S virtualbox "$(pacman -Qsq "^linux" | grep "^linux[0-9]*[-rt]*$" | awk '{print $1"-virtualbox-host-modules"}' ORS=' ')" &&
diff --git a/roles/collection-administrator-base/meta/main.yml b/roles/collection-administrator-base/meta/main.yml
index 633a8ce2..7caed099 100644
--- a/roles/collection-administrator-base/meta/main.yml
+++ b/roles/collection-administrator-base/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_git-client
\ No newline at end of file
+- git-client
\ No newline at end of file
diff --git a/roles/collection-administrator-network-analyze/meta/main.yml b/roles/collection-administrator-network-analyze/meta/main.yml
index 68ff7a3b..3d8aaa95 100644
--- a/roles/collection-administrator-network-analyze/meta/main.yml
+++ b/roles/collection-administrator-network-analyze/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_collection-administrator-base
\ No newline at end of file
+- collection-administrator-base
\ No newline at end of file
diff --git a/roles/collection-bluray-player/meta/main.yml b/roles/collection-bluray-player/meta/main.yml
index 11c93d43..8b24dd36 100644
--- a/roles/collection-bluray-player/meta/main.yml
+++ b/roles/collection-bluray-player/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_application-java
\ No newline at end of file
+- application-java
\ No newline at end of file
diff --git a/roles/collection-bluray-player/readme.md b/roles/collection-bluray-player/readme.md
index 59871a67..94c42188 100644
--- a/roles/collection-bluray-player/readme.md
+++ b/roles/collection-bluray-player/readme.md
@@ -1,4 +1,4 @@
-# pc_collection-blu-ray-player
+# collection-blu-ray-player
 
 ## further information
 - https://wiki.archlinux.org/title/Blu-ray#Using_aacskeys
diff --git a/roles/collection-designer/meta/main.yml b/roles/collection-designer/meta/main.yml
index 292eb72a..f2b89588 100644
--- a/roles/collection-designer/meta/main.yml
+++ b/roles/collection-designer/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_system-aur-helper
\ No newline at end of file
+- system-aur-helper
\ No newline at end of file
diff --git a/roles/collection-developer-arduino/meta/main.yml b/roles/collection-developer-arduino/meta/main.yml
index 9c22099a..04afe1e8 100644
--- a/roles/collection-developer-arduino/meta/main.yml
+++ b/roles/collection-developer-arduino/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_collection-developer-base
\ No newline at end of file
+- collection-developer-base
\ No newline at end of file
diff --git a/roles/collection-developer-base/meta/main.yml b/roles/collection-developer-base/meta/main.yml
index 68ff7a3b..3d8aaa95 100644
--- a/roles/collection-developer-base/meta/main.yml
+++ b/roles/collection-developer-base/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_collection-administrator-base
\ No newline at end of file
+- collection-administrator-base
\ No newline at end of file
diff --git a/roles/collection-developer-bash/meta/main.yml b/roles/collection-developer-bash/meta/main.yml
index 9c22099a..04afe1e8 100644
--- a/roles/collection-developer-bash/meta/main.yml
+++ b/roles/collection-developer-bash/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_collection-developer-base
\ No newline at end of file
+- collection-developer-base
\ No newline at end of file
diff --git a/roles/collection-developer-java/meta/main.yml b/roles/collection-developer-java/meta/main.yml
index 11c93d43..8b24dd36 100644
--- a/roles/collection-developer-java/meta/main.yml
+++ b/roles/collection-developer-java/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_application-java
\ No newline at end of file
+- application-java
\ No newline at end of file
diff --git a/roles/collection-developer-php/meta/main.yml b/roles/collection-developer-php/meta/main.yml
index 9c22099a..04afe1e8 100644
--- a/roles/collection-developer-php/meta/main.yml
+++ b/roles/collection-developer-php/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_collection-developer-base
\ No newline at end of file
+- collection-developer-base
\ No newline at end of file
diff --git a/roles/collection-developer-python/meta/main.yml b/roles/collection-developer-python/meta/main.yml
index 9c22099a..04afe1e8 100644
--- a/roles/collection-developer-python/meta/main.yml
+++ b/roles/collection-developer-python/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_collection-developer-base
\ No newline at end of file
+- collection-developer-base
\ No newline at end of file
diff --git a/roles/collection-entertainment/meta/main.yml b/roles/collection-entertainment/meta/main.yml
index 292eb72a..f2b89588 100644
--- a/roles/collection-entertainment/meta/main.yml
+++ b/roles/collection-entertainment/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_system-aur-helper
\ No newline at end of file
+- system-aur-helper
\ No newline at end of file
diff --git a/roles/collection-office/meta/main.yml b/roles/collection-office/meta/main.yml
index 67e07531..c67973f1 100644
--- a/roles/collection-office/meta/main.yml
+++ b/roles/collection-office/meta/main.yml
@@ -1,3 +1,3 @@
 dependencies:
-- pc_application-libreoffice
-- pc_collection-video-conference
\ No newline at end of file
+- application-libreoffice
+- collection-video-conference
\ No newline at end of file
diff --git a/roles/collection-torrent/meta/main.yml b/roles/collection-torrent/meta/main.yml
index 292eb72a..f2b89588 100644
--- a/roles/collection-torrent/meta/main.yml
+++ b/roles/collection-torrent/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_system-aur-helper
\ No newline at end of file
+- system-aur-helper
\ No newline at end of file
diff --git a/roles/collection-video-conference/README.md b/roles/collection-video-conference/README.md
index 551e4a6d..5ab8fdd8 100644
--- a/roles/collection-video-conference/README.md
+++ b/roles/collection-video-conference/README.md
@@ -1,4 +1,4 @@
-# pc_collection-video-conference
+# collection-video-conference
 
 ## further information
 It seems like the microsoft client is not supported nativly on linux anymore: https://aur.archlinux.org/packages/teams
\ No newline at end of file
diff --git a/roles/collection-video-conference/meta/main.yml b/roles/collection-video-conference/meta/main.yml
index 292eb72a..f2b89588 100644
--- a/roles/collection-video-conference/meta/main.yml
+++ b/roles/collection-video-conference/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_system-aur-helper
\ No newline at end of file
+- system-aur-helper
\ No newline at end of file
diff --git a/roles/driver-epson-multiprinter/Readme.md b/roles/driver-epson-multiprinter/Readme.md
index bd7bedc0..bc5d0d1c 100644
--- a/roles/driver-epson-multiprinter/Readme.md
+++ b/roles/driver-epson-multiprinter/Readme.md
@@ -1,4 +1,4 @@
-# role pc_driver-epson-multiprinter
+# role driver-epson-multiprinter
 ## further information
 - https://bernhardsteindl.at/epson-ecotank-et-3600-unter-arch-linux-einrichten/
 - http://download.ebz.epson.net/dsc/search/01/search/searchModule
diff --git a/roles/driver-epson-multiprinter/meta/main.yml b/roles/driver-epson-multiprinter/meta/main.yml
index 292eb72a..f2b89588 100644
--- a/roles/driver-epson-multiprinter/meta/main.yml
+++ b/roles/driver-epson-multiprinter/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_system-aur-helper
\ No newline at end of file
+- system-aur-helper
\ No newline at end of file
diff --git a/roles/driver-intel/Readme.md b/roles/driver-intel/Readme.md
index f91d0726..5b9f3a95 100644
--- a/roles/driver-intel/Readme.md
+++ b/roles/driver-intel/Readme.md
@@ -1 +1 @@
-# pc_driver-intel
\ No newline at end of file
+# driver-intel
\ No newline at end of file
diff --git a/roles/system-gnome/Readme.md b/roles/system-gnome/Readme.md
index ec7fab8b..8ade9fc6 100644
--- a/roles/system-gnome/Readme.md
+++ b/roles/system-gnome/Readme.md
@@ -1,3 +1,3 @@
-# pc_system-gnome
+# system-gnome
 ## further information
 - https://askubuntu.com/questions/1029376/how-do-i-enable-and-disable-gnome-extensions-from-the-command-line
\ No newline at end of file
diff --git a/roles/system-gnome/meta/main.yml b/roles/system-gnome/meta/main.yml
index e3cfc8f5..8a7e804e 100644
--- a/roles/system-gnome/meta/main.yml
+++ b/roles/system-gnome/meta/main.yml
@@ -1,3 +1,3 @@
 dependencies:
-- pc_git-client
-- pc_application-caffeine
\ No newline at end of file
+- git-client
+- application-caffeine
\ No newline at end of file
diff --git a/roles/system-swapfile/meta/main.yml b/roles/system-swapfile/meta/main.yml
index 633a8ce2..7caed099 100644
--- a/roles/system-swapfile/meta/main.yml
+++ b/roles/system-swapfile/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- pc_git-client
\ No newline at end of file
+- git-client
\ No newline at end of file