removing storage name from Metadata as first class citizen, replacing it with annotations

@ajcvickers @anpete @emilcicos @natemcmaster 
@emilcicos, is this OK?