Changed objects to be grouped by type instead of names.