diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 77cd0ed1..02c51be6 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -1,115 +1,118 @@
 # @summary
 #   Installs `mod_php`.
 # 
 # @todo
 #   Add docs
 class apache::mod::php (
   $package_name     = undef,
   $package_ensure   = 'present',
   $path             = undef,
   Array $extensions = ['.php'],
   $content          = undef,
   $template         = 'apache/mod/php.conf.erb',
   $source           = undef,
   $root_group       = $apache::params::root_group,
   $php_version      = $apache::params::php_version,
   $libphp_prefix    = 'libphp'
 ) inherits apache::params {
   include apache
   if (versioncmp($php_version, '8') < 0) {
     $mod = "php${php_version}"
   } else {
     $mod = 'php'
   }
 
   if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
     fail('If you define apache::version::scl_php_version, you also need to specify apache::version::scl_httpd_version')
   }
   if defined(Class['::apache::mod::prefork']) {
     Class['::apache::mod::prefork']->File["${mod}.conf"]
   }
   elsif defined(Class['::apache::mod::itk']) {
     Class['::apache::mod::itk']->File["${mod}.conf"]
   }
   else {
     fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']')
   }
 
   if $source and ($content or $template != 'apache/mod/php.conf.erb') {
     warning('source and content or template parameters are provided. source parameter will be used')
   } elsif $content and $template != 'apache/mod/php.conf.erb' {
     warning('content and template parameters are provided. content parameter will be used')
   }
 
   $manage_content = $source ? {
     undef   => $content ? {
       undef   => template($template),
       default => $content,
     },
     default => undef,
   }
 
   # Determine if we have a package
   $mod_packages = $apache::mod_packages
   if $package_name {
     $_package_name = $package_name
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
     $_package_name = $mod_packages[$mod]
   } elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack
     $_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version)
   } else {
     $_package_name = undef
   }
 
   $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1')
   $_php_version_no_dot = regsubst($php_version, '\.', '')
   if $apache::version::scl_httpd_version {
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
   } else {
     # Controls php version and libphp prefix
-    $_lib = "${libphp_prefix}${php_version}.so"
+    $_lib = $_php_major ? {
+      '8'     => "${libphp_prefix}.so",
+      default => "${libphp_prefix}${php_version}.so",
+    }
   }
   $_module_id = $_php_major ? {
     '5'     => 'php5_module',
     '7'     => 'php7_module',
     default => 'php_module',
   }
 
   if $::operatingsystem == 'SLES' {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
       lib            => "mod_${mod}.so",
       id             => $_module_id,
       path           => "${apache::lib_path}/mod_${mod}.so",
     }
   } else {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
       lib            => $_lib,
       id             => $_module_id,
       path           => $path,
     }
   }
 
   include apache::mod::mime
   include apache::mod::dir
   Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
   # Template uses $extensions
   file { "${mod}.conf":
     ensure  => file,
     path    => "${apache::mod_dir}/${mod}.conf",
     owner   => 'root',
     group   => $root_group,
     mode    => $apache::file_mode,
     content => $manage_content,
     source  => $source,
     require => [
       Exec["mkdir ${apache::mod_dir}"],
     ],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],
   }
 }
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index 885b1a2e..5c11c49b 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -1,325 +1,325 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
 
 describe 'apache::mod::php', type: :class do
   on_supported_os.each do |os, facts|
     context "on #{os} " do
       let :facts do
         facts
       end
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
       case facts[:os]['family']
       when 'Debian'
         describe 'on a Debian OS' do
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
           end
           case facts[:os]['release']['major']
           when '8'
             context 'on jessie' do
               it {
                 is_expected.to contain_file('php5.load').with(
                   content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
                 )
               }
               context 'with mpm_module => itk on jessie' do
                 let :pre_condition do
                   'class { "apache": mpm_module => itk, }'
                 end
 
                 it { is_expected.to contain_class('apache::params') }
                 it { is_expected.to contain_class('apache::mod::itk') }
                 it { is_expected.to contain_apache__mod('php5') }
                 it { is_expected.to contain_package('libapache2-mod-php5') }
                 it {
                   is_expected.to contain_file('php5.load').with(
                     content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
                   )
                 }
               end
             end
           when '9'
             context 'on stretch' do
               it { is_expected.to contain_apache__mod('php7.0') }
               it { is_expected.to contain_package('libapache2-mod-php7.0') }
               it {
                 is_expected.to contain_file('php7.0.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
                 )
               }
             end
           when '10'
             context 'on buster' do
               it { is_expected.to contain_apache__mod('php7.3') }
               it { is_expected.to contain_package('libapache2-mod-php7.3') }
               it {
                 is_expected.to contain_file('php7.3.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
                 )
               }
             end
             context 'on buster with experimental php8.0' do
               let :params do
                 { php_version: '8.0' }
               end
 
               it { is_expected.to contain_apache__mod('php') }
               it { is_expected.to contain_package('libapache2-mod-php8.0') }
               it {
                 is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
+                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
                 )
               }
             end
           when '16.04'
             context 'on stretch' do
               let :params do
                 { content: 'somecontent' }
               end
 
               it {
                 is_expected.to contain_file('php7.0.conf').with(
                   content: 'somecontent',
                 )
               }
             end
 
           when '18.04'
             context 'on stretch' do
               let :params do
                 { content: 'somecontent' }
               end
 
               it {
                 is_expected.to contain_file('php7.2.conf').with(
                   content: 'somecontent',
                 )
               }
             end
           end
         end
       when 'RedHat'
         describe 'on a RedHat OS' do
           context 'with default params' do
             let :pre_condition do
               'class { "apache": }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with alternative package name' do
             let :pre_condition do
               'class { "apache": }'
             end
             let :params do
               { package_name: 'php54' }
             end
 
             it { is_expected.to contain_package('php54') }
           end
           context 'with alternative path' do
             let :pre_condition do
               'class { "apache": }'
             end
             let :params do
               { path: 'alternative-path' }
             end
 
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with alternative extensions' do
             let :pre_condition do
               'class { "apache": }'
             end
             let :params do
               {
                 extensions: ['.php', '.php5'],
               }
             end
 
             it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) } if facts[:os]['release']['major'].to_i < 8
           end
           if facts[:os]['release']['major'].to_i > 5
             context 'with specific version' do
               let :pre_condition do
                 'class { "apache": }'
               end
               let :params do
                 { package_ensure: '5.3.13' }
               end
 
               it {
                 is_expected.to contain_package('php').with(
                   ensure: '5.3.13',
                 )
               }
             end
           end
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
             it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
             it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
         end
       when 'FreeBSD'
         describe 'on a FreeBSD OS' do
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('www/mod_php5') }
             it { is_expected.to contain_file('php5.load') }
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('www/mod_php5') }
             it { is_expected.to contain_file('php5.load') }
           end
         end
       when 'Gentoo'
         describe 'on a Gentoo OS' do
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('dev-lang/php') }
             it { is_expected.to contain_file('php5.load') }
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('dev-lang/php') }
             it { is_expected.to contain_file('php5.load') }
           end
         end
       end
 
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
               (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
               (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
 
       describe 'OS independent tests' do
         context 'with content param' do
           let :params do
             { content: 'somecontent' }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               content: 'somecontent',
             )
           }
         end
         context 'with template param' do
           let :params do
             { template: 'apache/mod/php.conf.erb' }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               content: %r{^# PHP is an HTML-embedded scripting language which attempts to make it},
             )
           }
         end
         context 'with source param' do
           let :params do
             { source: 'some-path' }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
         end
         context 'content has priority over template' do
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
               content: 'somecontent',
             }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               content: 'somecontent',
             )
           }
         end
         context 'source has priority over template' do
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
               source: 'some-path',
             }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
         end
         context 'source has priority over content' do
           let :params do
             {
               content: 'somecontent',
               source: 'some-path',
             }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
         end
         context 'with mpm_module => worker' do
           let :pre_condition do
             'class { "apache": mpm_module => worker, }'
           end
 
           it 'raises an error' do
             is_expected.to compile.and_raise_error(%r{mpm_module => 'prefork' or mpm_module => 'itk'})
           end
         end
       end
     end
   end
 end