diff --git a/devel_generate/file.devel_generate.inc b/devel_generate/file.devel_generate.inc
index 9fb145f..4751ebe 100644
--- a/devel_generate/file.devel_generate.inc
+++ b/devel_generate/file.devel_generate.inc
@@ -17,6 +17,7 @@ function _file_devel_generate($object, $field, $instance, $bundle) {
       $source->uri = $path;
       $source->uid = 1; // TODO: randomize? use case specific.
       $source->filemime = 'text/plain';
+      $source->filename = array_pop(explode("//", $path));
       $destination = $field['settings']['uri_scheme'] . '://' . $instance['settings']['file_directory'] . '/' . basename($path);
       $file = file_move($source, $destination);
     }
diff --git a/devel_generate/image.devel_generate.inc b/devel_generate/image.devel_generate.inc
index c2cc1a7..fbfbb59 100644
--- a/devel_generate/image.devel_generate.inc
+++ b/devel_generate/image.devel_generate.inc
@@ -29,6 +29,7 @@ function _image_devel_generate($object, $field, $instance, $bundle) {
       $source->uri = $path;
       $source->uid = 1; // TODO: randomize? Use case specific.
       $source->filemime = 'image/' . pathinfo($path, PATHINFO_EXTENSION);
+      $source->filename = array_pop(explode("//", $path));
       $destination_dir = $field['settings']['uri_scheme'] . '://' . $instance['settings']['file_directory'];
       file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
       $destination = $destination_dir . '/' . basename($path);