Fixes #5747 - Fine grained control over name expansion
Refs #5747 - Documentation for fine grained control over name expansion