[storage] Rename methods. Improve usage of Identity.
Merge pull request #274 from formapro-forks/storage-impr

[storage] Storage improvements.