Started changing the way the object names are stored so that we list the 'label' but we store the 'name'.  This is to avoid the problem of when the user renames an object we're referring to.