diff --git a/manifests/dir.pp b/manifests/dir.pp
index e10682a..1c302b1 100644
--- a/manifests/dir.pp
+++ b/manifests/dir.pp
@@ -53,8 +53,8 @@
 
   exec {"Create path ${rootpath}":
     path    => '/bin:/sbin:/usr/bin:/usr/sbin',
-    unless  => "test -e '${rootpath}'",
     command => "mkdir -p '${rootpath}'",
+    creates => '${rootpath}',
   }
 
   file {$rootpath:
diff --git a/manifests/share.pp b/manifests/share.pp
index 5bdaea8..50c15db 100644
--- a/manifests/share.pp
+++ b/manifests/share.pp
@@ -48,16 +48,16 @@
 ) {
 
   if defined(Package['SambaClassic']){
-    $require = Package['SambaClassic']
+    $smb_require = Package['SambaClassic']
     if defined(Service['SambaWinbind']) {
-      $notify  = Service['SambaSmb', 'SambaWinBind']
+      $smb_notify  = Service['SambaSmb', 'SambaWinBind']
     }
     else {
-      $notify  = Service['SambaSmb']
+      $smb_notify  = Service['SambaSmb']
     }
   }elsif defined(Package['SambaDC']){
-    $require = Exec['provisionAD']
-    $notify  = Service['SambaDC']
+    $smb_require = Exec['provisionAD']
+    $smb_notify  = Service['SambaDC']
   }else{
     fail('No mode matched, Missing class samba::classic or samba::dc?')
   }
@@ -81,8 +81,8 @@
       section => $name,
       setting => 'path',
       value   => $path,
-      require => $require,
-      notify  => $notify,
+      require => $smb_require,
+      notify  => $smb_notify,
     }
   }
 
@@ -90,8 +90,8 @@
   ::samba::option{ $optionsindex:
     options => $options,
     section => $name,
-    require => $require,
-    notify  => $notify,
+    require => $smb_require,
+    notify  => $smb_notify,
   }
 
   $absoptlist = prefix($absentoptions, $name)