Rename storage as it was only used by sustenance
Rename functions in storage