[storage] Storage improvements. 

Rename methods. Improve usage of Identity.