Increase coverage of the name segregation handling mechanism.