diff --git a/src/Lib/ProfferPath.php b/src/Lib/ProfferPath.php
index 2671f77..a8a64fa 100644
--- a/src/Lib/ProfferPath.php
+++ b/src/Lib/ProfferPath.php
@@ -10,7 +10,7 @@
 
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
-use Cake\Utility\String;
+use Cake\Utility\Text;
 
 class ProfferPath implements ProfferPathInterface
 {
@@ -199,7 +199,7 @@ public function generateSeed($seed = null)
             return $seed;
         }
 
-        return String::uuid();
+        return Text::uuid();
     }
 
     /**
diff --git a/src/Model/Behavior/ProfferBehavior.php b/src/Model/Behavior/ProfferBehavior.php
index 3fb9129..7b785be 100644
--- a/src/Model/Behavior/ProfferBehavior.php
+++ b/src/Model/Behavior/ProfferBehavior.php
@@ -71,7 +71,7 @@ public function beforeSave(Event $event, Entity $entity, ArrayObject $options, P
                 $path->createPathFolder();
 
                 if ($this->moveUploadedFile($entity->get($field)['tmp_name'], $path->fullPath())) {
-                    $entity->set($field, $entity->get($field)['name']);
+                    $entity->set($field, $path->getFilename());
                     $entity->set($settings['dir'], $path->getSeed());
 
                     // Only generate thumbnails for image uploads
@@ -119,7 +119,7 @@ public function afterDelete(Event $event, Entity $entity, ArrayObject $options,
                 $path->deleteFiles($path->getFolder(), true);
             }
 
-            unset($path);
+            $path = null;
         }
 
         return true;