Renamed references to storage in function names