diff --git a/roles/zabbix/zabbix-agent/defaults/main.yml b/roles/zabbix/zabbix_agent/defaults/main.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/defaults/main.yml
rename to roles/zabbix/zabbix_agent/defaults/main.yml
diff --git a/roles/zabbix/zabbix-agent/files/scripts/zabbix-check-eth-settings.sh b/roles/zabbix/zabbix_agent/files/scripts/zabbix-check-eth-settings.sh
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/scripts/zabbix-check-eth-settings.sh
rename to roles/zabbix/zabbix_agent/files/scripts/zabbix-check-eth-settings.sh
diff --git a/roles/zabbix/zabbix-agent/files/scripts/zabbix-check-iptables.sh b/roles/zabbix/zabbix_agent/files/scripts/zabbix-check-iptables.sh
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/scripts/zabbix-check-iptables.sh
rename to roles/zabbix/zabbix_agent/files/scripts/zabbix-check-iptables.sh
diff --git a/roles/zabbix/zabbix-agent/files/scripts/zabbix-check-ro.sh b/roles/zabbix/zabbix_agent/files/scripts/zabbix-check-ro.sh
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/scripts/zabbix-check-ro.sh
rename to roles/zabbix/zabbix_agent/files/scripts/zabbix-check-ro.sh
diff --git a/roles/zabbix/zabbix-agent/files/scripts/zabbix-hw-raid-check.sh b/roles/zabbix/zabbix_agent/files/scripts/zabbix-hw-raid-check.sh
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/scripts/zabbix-hw-raid-check.sh
rename to roles/zabbix/zabbix_agent/files/scripts/zabbix-hw-raid-check.sh
diff --git a/roles/zabbix/zabbix-agent/files/scripts/zabbix-mdstat-check.sh b/roles/zabbix/zabbix_agent/files/scripts/zabbix-mdstat-check.sh
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/scripts/zabbix-mdstat-check.sh
rename to roles/zabbix/zabbix_agent/files/scripts/zabbix-mdstat-check.sh
diff --git a/roles/zabbix/zabbix-agent/files/selinux/8/centos-zabbix-agent.pp b/roles/zabbix/zabbix_agent/files/selinux/8/centos-zabbix-agent.pp
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/selinux/8/centos-zabbix-agent.pp
rename to roles/zabbix/zabbix_agent/files/selinux/8/centos-zabbix-agent.pp
diff --git a/roles/zabbix/zabbix-agent/files/selinux/8/centos-zabbix-agent.te b/roles/zabbix/zabbix_agent/files/selinux/8/centos-zabbix-agent.te
similarity index 100%
rename from roles/zabbix/zabbix-agent/files/selinux/8/centos-zabbix-agent.te
rename to roles/zabbix/zabbix_agent/files/selinux/8/centos-zabbix-agent.te
diff --git a/roles/zabbix/zabbix-agent/handlers/main.yml b/roles/zabbix/zabbix_agent/handlers/main.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/handlers/main.yml
rename to roles/zabbix/zabbix_agent/handlers/main.yml
diff --git a/roles/zabbix/zabbix-agent/meta/main.yml b/roles/zabbix/zabbix_agent/meta/main.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/meta/main.yml
rename to roles/zabbix/zabbix_agent/meta/main.yml
diff --git a/roles/zabbix/zabbix-agent/tasks/main.yml b/roles/zabbix/zabbix_agent/tasks/main.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/tasks/main.yml
rename to roles/zabbix/zabbix_agent/tasks/main.yml
diff --git a/roles/zabbix/zabbix-agent/tasks/tools.yml b/roles/zabbix/zabbix_agent/tasks/tools.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/tasks/tools.yml
rename to roles/zabbix/zabbix_agent/tasks/tools.yml
diff --git a/roles/zabbix/zabbix-agent/templates/interface-alias.conf.j2 b/roles/zabbix/zabbix_agent/templates/interface-alias.conf.j2
similarity index 100%
rename from roles/zabbix/zabbix-agent/templates/interface-alias.conf.j2
rename to roles/zabbix/zabbix_agent/templates/interface-alias.conf.j2
diff --git a/roles/zabbix/zabbix-agent/templates/scripts/zabbix-conntrack-check.sh.j2 b/roles/zabbix/zabbix_agent/templates/scripts/zabbix-conntrack-check.sh.j2
similarity index 100%
rename from roles/zabbix/zabbix-agent/templates/scripts/zabbix-conntrack-check.sh.j2
rename to roles/zabbix/zabbix_agent/templates/scripts/zabbix-conntrack-check.sh.j2
diff --git a/roles/zabbix/zabbix-agent/templates/zabbix_agentd.conf.j2 b/roles/zabbix/zabbix_agent/templates/zabbix_agentd.conf.j2
similarity index 100%
rename from roles/zabbix/zabbix-agent/templates/zabbix_agentd.conf.j2
rename to roles/zabbix/zabbix_agent/templates/zabbix_agentd.conf.j2
diff --git a/roles/zabbix/zabbix-agent/vars/CentOS-8.yml b/roles/zabbix/zabbix_agent/vars/CentOS-8.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/vars/CentOS-8.yml
rename to roles/zabbix/zabbix_agent/vars/CentOS-8.yml
diff --git a/roles/zabbix/zabbix-agent/vars/Fedora.yml b/roles/zabbix/zabbix_agent/vars/Fedora.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/vars/Fedora.yml
rename to roles/zabbix/zabbix_agent/vars/Fedora.yml
diff --git a/roles/zabbix/zabbix-agent/vars/RedHat-8.yml b/roles/zabbix/zabbix_agent/vars/RedHat-8.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/vars/RedHat-8.yml
rename to roles/zabbix/zabbix_agent/vars/RedHat-8.yml
diff --git a/roles/zabbix/zabbix-agent/vars/common.yml b/roles/zabbix/zabbix_agent/vars/common.yml
similarity index 100%
rename from roles/zabbix/zabbix-agent/vars/common.yml
rename to roles/zabbix/zabbix_agent/vars/common.yml