Improve idempotency of role for taps and apps with unconventional names.