A little closer on the ObjectNamesForType changes.