Rename build_role_query to build_role_scope