LPS-38220 Remove the explicit real name querying, it can be merged into normal name query.

Sorry, Brian, this needs more changes than I expected.
Need to split it again to make it clear.