No functional change. Trying to indentify each kind of object uniquely and consistently. ... update docs as well.