Modified file name

Also modified storage object to add aditional name field