removing storage name from Metadata as first class citizen, replacing it with annotations (merged with emils changes)

Merged with Emil's changes and incorporated previous CR feedback

@anpete @emilcicos 
Original logic for storage name was that it would return Name, if the Storage name was not provided, i didn't want to change that, even though it does seem more explicit.