Prevent same-named storage and pair

[untitaker]

There doesn't seem to be a good reason not to do this, and I think it's good for clarity of CLI output.