be consistent s/container/storage

Be consistent use the storage definition everywhere instead of calling
some times a container.