Changed names on use cases.  Only display name, not identifier, which will remain a bit confusing.