diff --git a/storage/yaml_fs/yamlfile.py b/storage/yaml_fs/yamlfile.py
index 2a8b21a..b8cb154 100644
--- a/storage/yaml_fs/yamlfile.py
+++ b/storage/yaml_fs/yamlfile.py
@@ -8,6 +8,7 @@
 #
 import datatypes
 import yaml
+import os
 
 class YamlFile(object):
 
@@ -41,7 +42,8 @@
             parameters = {}
         parameters = datatypes.Parameters(parameters)
 
-        return datatypes.Entity(classes, applications, parameters)
+        return datatypes.Entity(classes, applications, parameters,
+                                name=os.path.basename(self._path))
     entity = property(lambda self: self._get_entity())
 
     def __repr__(self):