WP-1737: name hiding fix.