From 3aa5aacd7b7ffc9f59c6fe55906d88d5b5599dd4 Mon Sep 17 00:00:00 2001
From: mike <mike>
Date: Fri, 29 Jun 2007 15:10:16 +0000
Subject: [PATCH] Expect cql.serverChoice instead of srw.serverChoice

---
 test/regression/sections/01/01.xcql |    2 +-
 test/regression/sections/01/02.xcql |    2 +-
 test/regression/sections/01/03.xcql |    2 +-
 test/regression/sections/01/04.xcql |    2 +-
 test/regression/sections/01/05.xcql |    2 +-
 test/regression/sections/01/06.xcql |    2 +-
 test/regression/sections/01/07.xcql |    2 +-
 test/regression/sections/01/08.xcql |    2 +-
 test/regression/sections/01/09.xcql |    2 +-
 test/regression/sections/01/10.xcql |    2 +-
 test/regression/sections/01/11.xcql |    2 +-
 test/regression/sections/03/01.xcql |    4 ++--
 test/regression/sections/03/02.xcql |    4 ++--
 test/regression/sections/03/03.xcql |    4 ++--
 test/regression/sections/03/04.xcql |    4 ++--
 test/regression/sections/03/05.xcql |    4 ++--
 test/regression/sections/03/06.xcql |    4 ++--
 test/regression/sections/03/07.xcql |    4 ++--
 test/regression/sections/03/08.xcql |    4 ++--
 test/regression/sections/03/09.xcql |    8 ++++----
 test/regression/sections/04/02.xcql |    2 +-
 test/regression/sections/05/01.xcql |    4 ++--
 test/regression/sections/05/02.xcql |    4 ++--
 test/regression/sections/05/03.xcql |    4 ++--
 test/regression/sections/05/04.xcql |    4 ++--
 test/regression/sections/05/05.xcql |    2 +-
 test/regression/sections/05/07.xcql |    4 ++--
 test/regression/sections/05/08.xcql |    4 ++--
 test/regression/sections/05/09.xcql |    4 ++--
 test/regression/sections/06/01.xcql |    2 +-
 test/regression/sections/06/02.xcql |    2 +-
 test/regression/sections/06/03.xcql |    2 +-
 test/regression/sections/06/04.xcql |    2 +-
 test/regression/sections/06/05.xcql |    2 +-
 test/regression/sections/06/06.xcql |    2 +-
 test/regression/sections/07/01.xcql |    8 ++++----
 test/regression/sections/07/02.xcql |    8 ++++----
 test/regression/sections/07/03.xcql |    8 ++++----
 test/regression/sections/09/01.xcql |    4 ++--
 test/regression/sections/09/02.xcql |    2 +-
 test/regression/sections/09/03.xcql |    2 +-
 41 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/test/regression/sections/01/01.xcql b/test/regression/sections/01/01.xcql
index 81c9329..04e6f3f 100644
--- a/test/regression/sections/01/01.xcql
+++ b/test/regression/sections/01/01.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/02.xcql b/test/regression/sections/01/02.xcql
index 81c9329..04e6f3f 100644
--- a/test/regression/sections/01/02.xcql
+++ b/test/regression/sections/01/02.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/03.xcql b/test/regression/sections/01/03.xcql
index ebc8abe..216c15c 100644
--- a/test/regression/sections/01/03.xcql
+++ b/test/regression/sections/01/03.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/04.xcql b/test/regression/sections/01/04.xcql
index 778e221..4ca51f0 100644
--- a/test/regression/sections/01/04.xcql
+++ b/test/regression/sections/01/04.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/05.xcql b/test/regression/sections/01/05.xcql
index c270302..4ce7bc2 100644
--- a/test/regression/sections/01/05.xcql
+++ b/test/regression/sections/01/05.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/06.xcql b/test/regression/sections/01/06.xcql
index 72532e7..d7786cb 100644
--- a/test/regression/sections/01/06.xcql
+++ b/test/regression/sections/01/06.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/07.xcql b/test/regression/sections/01/07.xcql
index 57ea928..29742fc 100644
--- a/test/regression/sections/01/07.xcql
+++ b/test/regression/sections/01/07.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/08.xcql b/test/regression/sections/01/08.xcql
index 81c9329..04e6f3f 100644
--- a/test/regression/sections/01/08.xcql
+++ b/test/regression/sections/01/08.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/09.xcql b/test/regression/sections/01/09.xcql
index a04abd2..b8cbb85 100644
--- a/test/regression/sections/01/09.xcql
+++ b/test/regression/sections/01/09.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/10.xcql b/test/regression/sections/01/10.xcql
index 39d030e..a44a871 100644
--- a/test/regression/sections/01/10.xcql
+++ b/test/regression/sections/01/10.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/01/11.xcql b/test/regression/sections/01/11.xcql
index f37c504..6aa73cd 100644
--- a/test/regression/sections/01/11.xcql
+++ b/test/regression/sections/01/11.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/03/01.xcql b/test/regression/sections/03/01.xcql
index 9f1331f..de0acae 100644
--- a/test/regression/sections/03/01.xcql
+++ b/test/regression/sections/03/01.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/02.xcql b/test/regression/sections/03/02.xcql
index ecb10be..f5dba0b 100644
--- a/test/regression/sections/03/02.xcql
+++ b/test/regression/sections/03/02.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/03.xcql b/test/regression/sections/03/03.xcql
index af9231a..895ee06 100644
--- a/test/regression/sections/03/03.xcql
+++ b/test/regression/sections/03/03.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/04.xcql b/test/regression/sections/03/04.xcql
index af9231a..895ee06 100644
--- a/test/regression/sections/03/04.xcql
+++ b/test/regression/sections/03/04.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/05.xcql b/test/regression/sections/03/05.xcql
index dc9944b..4627440 100644
--- a/test/regression/sections/03/05.xcql
+++ b/test/regression/sections/03/05.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/06.xcql b/test/regression/sections/03/06.xcql
index 3f436f9..049b9d8 100644
--- a/test/regression/sections/03/06.xcql
+++ b/test/regression/sections/03/06.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/07.xcql b/test/regression/sections/03/07.xcql
index bfd6935..0a62182 100644
--- a/test/regression/sections/03/07.xcql
+++ b/test/regression/sections/03/07.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/08.xcql b/test/regression/sections/03/08.xcql
index c0e5d85..d971224 100644
--- a/test/regression/sections/03/08.xcql
+++ b/test/regression/sections/03/08.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/03/09.xcql b/test/regression/sections/03/09.xcql
index ab25e22..9b7f604 100644
--- a/test/regression/sections/03/09.xcql
+++ b/test/regression/sections/03/09.xcql
@@ -14,7 +14,7 @@
           </boolean>
           <leftOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -23,7 +23,7 @@
           </leftOperand>
           <rightOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -34,7 +34,7 @@
       </leftOperand>
       <rightOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
@@ -45,7 +45,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/04/02.xcql b/test/regression/sections/04/02.xcql
index 3effdba..682adcd 100644
--- a/test/regression/sections/04/02.xcql
+++ b/test/regression/sections/04/02.xcql
@@ -18,7 +18,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/01.xcql b/test/regression/sections/05/01.xcql
index 54c7d7d..b42c733 100644
--- a/test/regression/sections/05/01.xcql
+++ b/test/regression/sections/05/01.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/02.xcql b/test/regression/sections/05/02.xcql
index fced1cc..bfebedd 100644
--- a/test/regression/sections/05/02.xcql
+++ b/test/regression/sections/05/02.xcql
@@ -19,7 +19,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -28,7 +28,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/03.xcql b/test/regression/sections/05/03.xcql
index 98cd944..aa8ab2d 100644
--- a/test/regression/sections/05/03.xcql
+++ b/test/regression/sections/05/03.xcql
@@ -11,7 +11,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -20,7 +20,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/04.xcql b/test/regression/sections/05/04.xcql
index 024fad4..a08a64e 100644
--- a/test/regression/sections/05/04.xcql
+++ b/test/regression/sections/05/04.xcql
@@ -11,7 +11,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -20,7 +20,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/05.xcql b/test/regression/sections/05/05.xcql
index f630a95..9212ca4 100644
--- a/test/regression/sections/05/05.xcql
+++ b/test/regression/sections/05/05.xcql
@@ -20,7 +20,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/07.xcql b/test/regression/sections/05/07.xcql
index 54c7d7d..b42c733 100644
--- a/test/regression/sections/05/07.xcql
+++ b/test/regression/sections/05/07.xcql
@@ -4,7 +4,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -13,7 +13,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/08.xcql b/test/regression/sections/05/08.xcql
index 2f53f26..91f7926 100644
--- a/test/regression/sections/05/08.xcql
+++ b/test/regression/sections/05/08.xcql
@@ -9,7 +9,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -18,7 +18,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/05/09.xcql b/test/regression/sections/05/09.xcql
index 3c7d71b..d406c53 100644
--- a/test/regression/sections/05/09.xcql
+++ b/test/regression/sections/05/09.xcql
@@ -11,7 +11,7 @@
   </boolean>
   <leftOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
@@ -20,7 +20,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/06/01.xcql b/test/regression/sections/06/01.xcql
index 07fc51b..6e59421 100644
--- a/test/regression/sections/06/01.xcql
+++ b/test/regression/sections/06/01.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/06/02.xcql b/test/regression/sections/06/02.xcql
index 81c9329..04e6f3f 100644
--- a/test/regression/sections/06/02.xcql
+++ b/test/regression/sections/06/02.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/06/03.xcql b/test/regression/sections/06/03.xcql
index 133b7ae..7411f1a 100644
--- a/test/regression/sections/06/03.xcql
+++ b/test/regression/sections/06/03.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/06/04.xcql b/test/regression/sections/06/04.xcql
index cb7d890..4c5cf95 100644
--- a/test/regression/sections/06/04.xcql
+++ b/test/regression/sections/06/04.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/06/05.xcql b/test/regression/sections/06/05.xcql
index 7f02628..d82b932 100644
--- a/test/regression/sections/06/05.xcql
+++ b/test/regression/sections/06/05.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/06/06.xcql b/test/regression/sections/06/06.xcql
index 37dfdf1..f9851fb 100644
--- a/test/regression/sections/06/06.xcql
+++ b/test/regression/sections/06/06.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/07/01.xcql b/test/regression/sections/07/01.xcql
index a8ae269..e9baec9 100644
--- a/test/regression/sections/07/01.xcql
+++ b/test/regression/sections/07/01.xcql
@@ -14,7 +14,7 @@
           </boolean>
           <leftOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -23,7 +23,7 @@
           </leftOperand>
           <rightOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -34,7 +34,7 @@
       </leftOperand>
       <rightOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
@@ -45,7 +45,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/07/02.xcql b/test/regression/sections/07/02.xcql
index 7ffaa5f..8df4539 100644
--- a/test/regression/sections/07/02.xcql
+++ b/test/regression/sections/07/02.xcql
@@ -9,7 +9,7 @@
       </boolean>
       <leftOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
@@ -18,7 +18,7 @@
       </leftOperand>
       <rightOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
@@ -34,7 +34,7 @@
       </boolean>
       <leftOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
@@ -43,7 +43,7 @@
       </leftOperand>
       <rightOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
diff --git a/test/regression/sections/07/03.xcql b/test/regression/sections/07/03.xcql
index edd4e74..3a057fd 100644
--- a/test/regression/sections/07/03.xcql
+++ b/test/regression/sections/07/03.xcql
@@ -9,7 +9,7 @@
       </boolean>
       <leftOperand>
         <searchClause>
-          <index>srw.serverChoice</index>
+          <index>cql.serverChoice</index>
           <relation>
             <value>scr</value>
           </relation>
@@ -23,7 +23,7 @@
           </boolean>
           <leftOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -32,7 +32,7 @@
           </leftOperand>
           <rightOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -45,7 +45,7 @@
   </leftOperand>
   <rightOperand>
     <searchClause>
-      <index>srw.serverChoice</index>
+      <index>cql.serverChoice</index>
       <relation>
         <value>scr</value>
       </relation>
diff --git a/test/regression/sections/09/01.xcql b/test/regression/sections/09/01.xcql
index a97bf29..eac3a28 100644
--- a/test/regression/sections/09/01.xcql
+++ b/test/regression/sections/09/01.xcql
@@ -14,7 +14,7 @@
           </boolean>
           <leftOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
@@ -23,7 +23,7 @@
           </leftOperand>
           <rightOperand>
             <searchClause>
-              <index>srw.serverChoice</index>
+              <index>cql.serverChoice</index>
               <relation>
                 <value>scr</value>
               </relation>
diff --git a/test/regression/sections/09/02.xcql b/test/regression/sections/09/02.xcql
index f466273..eb0d4a9 100644
--- a/test/regression/sections/09/02.xcql
+++ b/test/regression/sections/09/02.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
diff --git a/test/regression/sections/09/03.xcql b/test/regression/sections/09/03.xcql
index ce0bb82..ee798ea 100644
--- a/test/regression/sections/09/03.xcql
+++ b/test/regression/sections/09/03.xcql
@@ -1,5 +1,5 @@
 <searchClause>
-  <index>srw.serverChoice</index>
+  <index>cql.serverChoice</index>
   <relation>
     <value>scr</value>
   </relation>
-- 
1.7.10.4