Removing storage name - new version

 after Emil's feedback and latest changes to AST