Hygiene: Remove naming conflict with CheckUser

CheckUserQuery was issuing an error upon

    use CheckUser;

due to the duplicated name.  Its also clearer this way.

Change-Id: I165d39b034ae5efc9524b8e2d55a6632ef1dc77d
Merge "Hygiene: Remove naming conflict with CheckUser"