Using storage as a keyword, to make it more consistent with the Storage ...

...class name