CASE_INSENSITIVE until we can safely downgrade.

22 files changed, 132 insertions, 132 deletions

diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index d2d5b91f894..760d39b8f55 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
index 499cf693a6e..951cd8e4157 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -33,7 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg
index 50c6de9d4da..1700cc5ff32 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype INT8
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype INT8
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -243,7 +243,7 @@ attribute[].datatype INT64
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -273,7 +273,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -303,7 +303,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -333,7 +333,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -363,7 +363,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -393,7 +393,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -423,7 +423,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -453,7 +453,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -483,7 +483,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -513,7 +513,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg
index f8fb274ae14..632ab97bbfe 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -243,7 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -273,7 +273,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -303,7 +303,7 @@ attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -333,7 +333,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -363,7 +363,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -393,7 +393,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -423,7 +423,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -453,7 +453,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -483,7 +483,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -513,7 +513,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg
index 84644de548e..8bfc14e6795 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -243,7 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg
index cb86e0a6fb1..188ebed6bc2 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
index 258dd2e030f..f2a18de22bf 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg
index 8e441537641..0433c41fced 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
index 24e3baa12f1..894683e6389 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -63,7 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -123,7 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -153,7 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -213,7 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg
index a7b5e5af1ca..16ddd67ad6d 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg
index be9ccf47be3..900a93efe23 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg
index d0843e1aa0f..93dfc9b3234 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg
index c03db9f7e8d..35b9a1722a9 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -33,7 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
index b647a7408fa..e9471d91c45 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -33,7 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg
index 7cbd7e775d9..e1685f55357 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -243,7 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -273,7 +273,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -303,7 +303,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index 20a48d79cce..0b3c39c44f6 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -243,7 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -273,7 +273,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg
index 101d809b469..52ad169550d 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype PREDICATE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index bd543a79da1..a0657f5bc27 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg
index f629d78a3b0..1517a96950c 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg
index 62cf845c861..e878c1f054f 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index 9423ed957fb..71789c2987c 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg
index a1230dcbef8..e48d4d1bd09 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -3,7 +3,7 @@ attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -33,7 +33,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -63,7 +63,7 @@ attribute[].datatype BOOL
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -93,7 +93,7 @@ attribute[].datatype FLOAT16
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -123,7 +123,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -153,7 +153,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -183,7 +183,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -213,7 +213,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -243,7 +243,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -273,7 +273,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -303,7 +303,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -333,7 +333,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -363,7 +363,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match UNCASED
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false