diff --git a/manifests/classic.pp b/manifests/classic.pp
index f3e9704..7e60065 100644
--- a/manifests/classic.pp
+++ b/manifests/classic.pp
@@ -217,7 +217,7 @@
 
   service{ 'SambaSmb':
     ensure  => 'running',
-    name    => $samba::params::servivesmb,
+    name    => $samba::params::servicesmb,
     require => [ Package['SambaClassic'], File['SambaOptsFile'] ],
     enable  => true,
   }
@@ -225,7 +225,7 @@
   if $manage_winbind {
     service{ 'SambaWinBind':
       ensure  => 'running',
-      name    => $samba::params::servivewinbind,
+      name    => $samba::params::servicewinbind,
       require => [ Package['SambaClassic'], File['SambaOptsFile'] ],
       enable  => true,
     }
diff --git a/manifests/dc.pp b/manifests/dc.pp
index d1859a6..7c4cb9a 100644
--- a/manifests/dc.pp
+++ b/manifests/dc.pp
@@ -175,7 +175,7 @@
 
   service{ 'SambaClassic':
     ensure  => 'stopped',
-    name    => $::samba::params::servivesmb,
+    name    => $::samba::params::servicesmb,
     enable  => false,
     require => Package['SambaDC'],
     notify  => Service['SambaDC'],
@@ -211,7 +211,7 @@
 
   service{ 'SambaDC':
     ensure  => 'running',
-    name    => $::samba::params::servivesambadc,
+    name    => $::samba::params::servicesambadc,
     require => [ Exec['provisionAD'], File['SambaOptsFile'] ],
     enable  => true,
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index c342e45..e3bb050 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -16,9 +16,9 @@
           $packagesambapamwinbind = 'samba-winbind-clients'
           $packagesambaclient     = 'samba-client'
           # for now, this is not supported by Debian
-          $servivesambadc         = undef
-          $servivesmb             = 'smb'
-          $servivewinbind         = 'winbind'
+          $servicesambadc         = undef
+          $servicesmb             = 'smb'
+          $servicewinbind         = 'winbind'
           $sambacmd               = '/usr/bin/samba-tool'
           $sambaclientcmd         = '/usr/bin/smbclient'
           $sambaoptsfile          = '/etc/sysconfig/samba'
@@ -35,15 +35,15 @@
           $packagesambansswinbind = 'libnss-winbind'
           $packagesambapamwinbind = 'libpam-winbind'
           $packagesambaclient     = 'smbclient'
-          $servivesambadc         = 'samba-ad-dc'
+          $servicesambadc         = 'samba-ad-dc'
           if $facts['os']['name'] == 'Ubuntu' {
-            $servivesmb           = 'smbd'
-          } elsif ($facts['os']['name'] == 'Debian') and ($facts['os']['release']['major'] >= '8') {
-            $servivesmb           = 'smbd'
+            $servicesmb           = 'smbd'
+          } elsif ($facts['os']['name'] == 'Debian') and (versioncmp($facts['os']['release']['full'], '8') >= 0) {
+            $servicesmb           = 'smbd'
           } else {
-            $servivesmb           = 'samba'
+            $servicesmb           = 'samba'
           }
-          $servivewinbind         = 'winbind'
+          $servicewinbind         = 'winbind'
           $sambacmd               = '/usr/bin/samba-tool'
           $sambaclientcmd         = '/usr/bin/smbclient'
           $sambaoptsfile          = '/etc/default/samba4'
@@ -60,9 +60,9 @@
           $packagesambansswinbind = 'libnss-winbind'
           $packagesambapamwinbind = 'libpam-winbind'
           $packagesambaclient     = 'smbclient'
-          $servivesambadc         = 'samba'
-          $servivesmb             = 'smbd'
-          $servivewinbind         = 'winbindd'
+          $servicesambadc         = 'samba'
+          $servicesmb             = 'smbd'
+          $servicewinbind         = 'winbindd'
           $sambacmd               = '/usr/bin/samba-tool'
           $sambaclientcmd         = '/usr/bin/smbclient'
           $sambaoptsfile          = '/etc/default/samba4'