Improve storage function naming