diff --git a/playbooks/shell.yml b/playbooks/shell.yml
index 8e18ef4..07873f1 100644
--- a/playbooks/shell.yml
+++ b/playbooks/shell.yml
@@ -19,8 +19,8 @@
     - sssd
     - autofs
     - thinlinc-server
-    - epel-repo
-    - powertools-repo
+    - epel_repo
+    - powertools_repo
     - role: nginx/server
       plaintext: true
 
@@ -71,7 +71,7 @@
         - cups
         - firefox
         - git
-        - google-chrome
+        - google_chrome
         - lynx
         - mutt
         - opencollab
diff --git a/roles/ansible-host/meta/main.yml b/roles/ansible-host/meta/main.yml
index f0a9153..27b9b1f 100644
--- a/roles/ansible-host/meta/main.yml
+++ b/roles/ansible-host/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
   - {role: git}
   - {role: nginx/server}
diff --git a/roles/clamav/meta/main.yml b/roles/clamav/meta/main.yml
index ffbd9de..0153d6e 100644
--- a/roles/clamav/meta/main.yml
+++ b/roles/clamav/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
diff --git a/roles/collab/meta/main.yml b/roles/collab/meta/main.yml
index 1d6cc65..45690df 100644
--- a/roles/collab/meta/main.yml
+++ b/roles/collab/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
   - {role: foo.sh-repo}
   - {role: apache}
diff --git a/roles/foo.sh-repo/meta/main.yml b/roles/foo.sh-repo/meta/main.yml
index f231ec3..eb8f0e7 100644
--- a/roles/foo.sh-repo/meta/main.yml
+++ b/roles/foo.sh-repo/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
diff --git a/roles/ldap_gravatar/meta/main.yml b/roles/ldap_gravatar/meta/main.yml
index f231ec3..eb8f0e7 100644
--- a/roles/ldap_gravatar/meta/main.yml
+++ b/roles/ldap_gravatar/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
diff --git a/roles/ldap_netdb/meta/main.yml b/roles/ldap_netdb/meta/main.yml
index f231ec3..eb8f0e7 100644
--- a/roles/ldap_netdb/meta/main.yml
+++ b/roles/ldap_netdb/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
diff --git a/roles/munin-node/meta/main.yml b/roles/munin-node/meta/main.yml
index 34ed789..e2d7c23 100644
--- a/roles/munin-node/meta/main.yml
+++ b/roles/munin-node/meta/main.yml
@@ -1,10 +1,10 @@
 ---
 dependencies:
-  - role: epel-repo
+  - role: epel_repo
     when:
       - ansible_distribution != "Fedora"
       - ansible_os_family == "RedHat"
-  - role: powertools-repo
+  - role: powertools_repo
     when:
       - ansible_distribution != "Fedora"
       - ansible_os_family == "RedHat"
diff --git a/roles/munin-server/meta/main.yml b/roles/munin-server/meta/main.yml
index 1d114c1..f5ebc76 100644
--- a/roles/munin-server/meta/main.yml
+++ b/roles/munin-server/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
   - {role: apache}
-  - {role: epel-repo}
-  - {role: powertools-repo}
+  - {role: epel_repo}
+  - {role: powertools_repo}
diff --git a/roles/spamassassin-ixhash/meta/main.yml b/roles/spamassassin-ixhash/meta/main.yml
index 6a15da6..31e6814 100644
--- a/roles/spamassassin-ixhash/meta/main.yml
+++ b/roles/spamassassin-ixhash/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
   - {role: spamassassin}
diff --git a/roles/spamassassin-pyzor/meta/main.yml b/roles/spamassassin-pyzor/meta/main.yml
index 6a15da6..31e6814 100644
--- a/roles/spamassassin-pyzor/meta/main.yml
+++ b/roles/spamassassin-pyzor/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
   - {role: spamassassin}
diff --git a/roles/spamassassin-razor/meta/main.yml b/roles/spamassassin-razor/meta/main.yml
index 6a15da6..31e6814 100644
--- a/roles/spamassassin-razor/meta/main.yml
+++ b/roles/spamassassin-razor/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 
 dependencies:
-  - {role: epel-repo}
+  - {role: epel_repo}
   - {role: spamassassin}
diff --git a/roles/zoneminder/meta/main.yml b/roles/zoneminder/meta/main.yml
index bc70472..39b2859 100644
--- a/roles/zoneminder/meta/main.yml
+++ b/roles/zoneminder/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 dependencies:
   - {role: apache}
-  - {role: rpmfusion-free-repo}
+  - {role: rpmfusion_free_repo}
diff --git a/software b/software
index 63b9b92..be27347 160000
--- a/software
+++ b/software
@@ -1 +1 @@
-Subproject commit 63b9b92166a3f7c262f04f95d6bde9a0fb983d7a
+Subproject commit be273475c9652f9b089449b79d62fefbb3c6ace1