BACKLOG-1371 EntityID was spelled as both EntityId and EntityID which created a lot of confusion and bugs like idp entity id not being present when tracking logins. Now all spellings are changed to the most used version: EntityID, which is also how SAML spells it.
BACKLOG-1371 Simplified check for english name
BACKLOG-1371 Formatted ternary statement