More updates trying to get the ObjectNamesForType restructuring to work