MobileIDNameQuery renamed to BasicQuery