swappable -> paged

28 files changed, 170 insertions, 170 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
index f9520159383..2ec725b46fc 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java
@@ -222,8 +222,8 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
         if (attribute.isHuge()) {
             aaB.huge(true);
         }
-        if (attribute.isSwappable()) {
-            aaB.swappable(true);
+        if (attribute.isPaged()) {
+            aaB.paged(true);
         }
         if (attribute.getSorting().isDescending()) {
             aaB.sortascending(false);
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
index 0dacb832ab7..d0b8719a1ea 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
@@ -57,7 +57,7 @@ public final class Attribute implements Cloneable, Serializable {
     private boolean fastAccess = false;
     private boolean huge = false;
     private boolean mutable = false;
-    private boolean swappable = false;
+    private boolean paged = false;
     private int arity = BooleanIndexDefinition.DEFAULT_ARITY;
     private long lowerBound = BooleanIndexDefinition.DEFAULT_LOWER_BOUND;
     private long upperBound = BooleanIndexDefinition.DEFAULT_UPPER_BOUND;
@@ -188,22 +188,22 @@ public final class Attribute implements Cloneable, Serializable {
     /** Returns the prefetch value of this, null if the default is used. */
     public Boolean getPrefetchValue() { return prefetch; }
 
-    public boolean isRemoveIfZero()       { return removeIfZero; }
-    public boolean isCreateIfNonExistent(){ return createIfNonExistent; }
-    public boolean isEnabledBitVectors()  { return enableBitVectors; }
+    public boolean isRemoveIfZero()         { return removeIfZero; }
+    public boolean isCreateIfNonExistent()  { return createIfNonExistent; }
+    public boolean isEnabledBitVectors()    { return enableBitVectors; }
     public boolean isEnabledOnlyBitVector() { return enableOnlyBitVector; }
-    public boolean isFastSearch()         { return fastSearch; }
-    public boolean isFastAccess()         { return fastAccess; }
-    public boolean isHuge()               { return huge; }
-    public boolean isSwappable()          { return swappable; }
-    public boolean isPosition()           { return isPosition; }
-    public boolean isMutable()            { return mutable; }
-
-    public int arity() { return arity; }
+    public boolean isFastSearch()           { return fastSearch; }
+    public boolean isFastAccess()           { return fastAccess; }
+    public boolean isHuge()                 { return huge; }
+    public boolean isPaged()                { return paged; }
+    public boolean isPosition()             { return isPosition; }
+    public boolean isMutable()              { return mutable; }
+
+    public int arity()       { return arity; }
     public long lowerBound() { return lowerBound; }
     public long upperBound() { return upperBound; }
     public double densePostingListThreshold() { return densePostingListThreshold; }
-    public Optional<TensorType> tensorType() { return tensorType; }
+    public Optional<TensorType> tensorType()  { return tensorType; }
     public Optional<StructuredDataType> referenceDocumentType() { return referenceDocumentType; }
 
     public static final DistanceMetric DEFAULT_DISTANCE_METRIC = DistanceMetric.EUCLIDEAN;
@@ -228,7 +228,7 @@ public final class Attribute implements Cloneable, Serializable {
     public void setEnableOnlyBitVector(boolean enableOnlyBitVector) { this.enableOnlyBitVector = enableOnlyBitVector; }
     public void setFastSearch(boolean fastSearch)                { this.fastSearch = fastSearch; }
     public void setHuge(boolean huge)                            { this.huge = huge; }
-    public void setSwappable(boolean swappable)                  { this.swappable = swappable; }
+    public void setPaged(boolean paged)                  { this.paged = paged; }
     public void setFastAccess(boolean fastAccess)                { this.fastAccess = fastAccess; }
     public void setPosition(boolean position)                    { this.isPosition = position; }
     public void setMutable(boolean mutable)                      { this.mutable = mutable; }
@@ -359,7 +359,7 @@ public final class Attribute implements Cloneable, Serializable {
     public int hashCode() {
         return Objects.hash(
                 name, type, collectionType, sorting, dictionary, isPrefetch(), fastAccess, removeIfZero,
-                createIfNonExistent, isPosition, huge, mutable, swappable, enableBitVectors, enableOnlyBitVector,
+                createIfNonExistent, isPosition, huge, mutable, paged, enableBitVectors, enableOnlyBitVector,
                 tensorType, referenceDocumentType, distanceMetric, hnswIndexParams);
     }
 
@@ -384,7 +384,7 @@ public final class Attribute implements Cloneable, Serializable {
         if (this.fastSearch != other.fastSearch) return false;
         if (this.huge != other.huge) return false;
         if (this.mutable != other.mutable) return false;
-        if (this.swappable != other.swappable) return false;
+        if (this.paged != other.paged) return false;
         if (! this.sorting.equals(other.sorting)) return false;
         if (! Objects.equals(dictionary, other.dictionary)) return false;
         if (! Objects.equals(tensorType, other.tensorType)) return false;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java
index 8c6c9ecd696..1126c1cab87 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java
@@ -18,7 +18,7 @@ public class AttributeOperation implements FieldOperation, FieldOperationContain
     private Boolean fastSearch;
     private Boolean fastAccess;
     private Boolean mutable;
-    private Boolean swappable;
+    private Boolean paged;
     private Boolean enableBitVectors;
     private Boolean enableOnlyBitVector;
     //TODO: Remember sorting!!
@@ -74,8 +74,8 @@ public class AttributeOperation implements FieldOperation, FieldOperationContain
     public void setMutable(Boolean mutable) {
         this.mutable = mutable;
     }
-    public void setSwappable(Boolean swappable) {
-        this.swappable = swappable;
+    public void setPaged(Boolean paged) {
+        this.paged = paged;
     }
 
     public Boolean getEnableBitVectors() {
@@ -135,8 +135,8 @@ public class AttributeOperation implements FieldOperation, FieldOperationContain
         if (huge != null) {
             attribute.setHuge(huge);
         }
-        if (swappable != null) {
-            attribute.setSwappable(swappable);
+        if (paged != null) {
+            attribute.setPaged(paged);
         }
         if (fastSearch != null) {
             attribute.setFastSearch(fastSearch);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java
index a5f4683c09b..50eabdb2a1a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java
@@ -105,7 +105,7 @@ public class AttributeChangeValidator {
                 validateAttributeSetting(id, currAttr, nextAttr, AttributeChangeValidator::extractDictionaryType, "dictionary: btree/hash", result);
                 validateAttributeSetting(id, currAttr, nextAttr, AttributeChangeValidator::extractDictionaryCase, "dictionary: cased/uncased", result);
                 validateAttributeSetting(id, currAttr, nextAttr, Attribute::isHuge, "huge", result);
-                validateAttributeSetting(id, currAttr, nextAttr, Attribute::isSwappable, "swappable", result);
+                validateAttributeSetting(id, currAttr, nextAttr, Attribute::isPaged, "paged", result);
                 validateAttributeSetting(id, currAttr, nextAttr, Attribute::densePostingListThreshold, "dense-posting-list-threshold", result);
                 validateAttributeSetting(id, currAttr, nextAttr, Attribute::isEnabledOnlyBitVector, "rank: filter", result);
                 validateAttributeSetting(id, currAttr, nextAttr, Attribute::distanceMetric, "distance-metric", result);
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 3ef2474a0bb..229c139e9a8 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -299,7 +299,7 @@ TOKEN :
 | < ENABLEONLYBITVECTOR: "enable-only-bit-vector" >
 | < FASTACCESS: "fast-access" >
 | < MUTABLE: "mutable" >
-| < SWAPPABLE: "swappable" >
+| < PAGED: "paged" >
 | < FASTSEARCH: "fast-search" >
 | < HUGE: "huge" >
 | < TENSOR_TYPE: "tensor" ("<" (~["<",">"])+ ">")? "(" (~["(",")"])+ ")" >
@@ -1230,13 +1230,13 @@ Object attributeSetting(FieldOperationContainer field, AttributeOperation attrib
 }
 {
     (
-        <HUGE>                   { attribute.setHuge(true); }
-      | <FASTSEARCH>            { attribute.setFastSearch(true); }
-      | <FASTACCESS>            { attribute.setFastAccess(true); }
-      | <MUTABLE>                { attribute.setMutable(true); }
-      | <SWAPPABLE>              { attribute.setSwappable(true); }
-      | <ENABLEBITVECTORS>       { attribute.setEnableBitVectors(true); }
-      | <ENABLEONLYBITVECTOR> { attribute.setEnableOnlyBitVector(true); }
+        <HUGE>                 { attribute.setHuge(true); }
+      | <FASTSEARCH>           { attribute.setFastSearch(true); }
+      | <FASTACCESS>           { attribute.setFastAccess(true); }
+      | <MUTABLE>              { attribute.setMutable(true); }
+      | <PAGED>                { attribute.setPaged(true); }
+      | <ENABLEBITVECTORS>     { attribute.setEnableBitVectors(true); }
+      | <ENABLEONLYBITVECTOR>  { attribute.setEnableOnlyBitVector(true); }
       | sorting(field, attributeName)
       | <ALIAS> { String alias; String aliasedName=attributeName; } [aliasedName = identifier()] <COLON> alias = identifierWithDash() {
           attribute.setDoAlias(true);
@@ -2738,7 +2738,7 @@ String identifier() : { }
       | <SECONDPHASE>
       | <SORTING>
       | <SOURCE>
-      | <SWAPPABLE>
+      | <PAGED>
       | <SSCONTEXTUAL>
       | <SSOVERRIDE>
       | <SSTITLE>
diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index cd654bedbae..f6dc8415f2b 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
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 c2c2b83c06a..95d7e5e9299 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
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg
index a7285d7fb5f..fecc0d9a7a0 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -256,7 +256,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -287,7 +287,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -318,7 +318,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -349,7 +349,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -380,7 +380,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -411,7 +411,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -442,7 +442,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -473,7 +473,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -504,7 +504,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -535,7 +535,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg
index ff3f9a7eebc..051b8a11248 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -256,7 +256,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -287,7 +287,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -318,7 +318,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -349,7 +349,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -380,7 +380,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -411,7 +411,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -442,7 +442,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -473,7 +473,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -504,7 +504,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -535,7 +535,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg
index f9d4c1bd316..dc71d841d25 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge true
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -256,7 +256,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg
index a1b0aee8818..b25f30d0462 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
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 50970f26951..c74b850eeac 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
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
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 82a85cbdc44..b82d4828793 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
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 cdc64100c52..6cc4b807566 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg
index 6abbbc5d9d5..b70481a3c10 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg
index b81bb6e6b04..09663615a3d 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg
index 39a94f2ff47..7ce3940897f 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg
index 6acc6481af4..5db23544775 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
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 bd9fcf946a2..2f4a1c2975e 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
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg
index c9ec14396ee..ce3509b2519 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -256,7 +256,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -287,7 +287,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -318,7 +318,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index dffc2f3e09e..dc445cde09f 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -256,7 +256,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -287,7 +287,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg
index bfe628894a0..0d84a1e102e 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index 455502d8ee9..35671069fda 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg
index 94103a5572a..8fa0da9aace 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg
index 0e527701ee8..da23c247a28 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending false
 attribute[].sortfunction LOWERCASE
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending false
 attribute[].sortfunction LOWERCASE
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending false
 attribute[].sortfunction LOWERCASE
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index f2dd2b2054a..5acc99aa640 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg
index e89aae2b9dd..ed23b285b3b 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -8,7 +8,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -39,7 +39,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -70,7 +70,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -101,7 +101,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -132,7 +132,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -163,7 +163,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -194,7 +194,7 @@ attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -225,7 +225,7 @@ attribute[].removeifzero true
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -256,7 +256,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent true
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -287,7 +287,7 @@ attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -318,7 +318,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -349,7 +349,7 @@ attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
@@ -380,7 +380,7 @@ attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
 attribute[].huge false
-attribute[].swappable false
+attribute[].paged false
 attribute[].ismutable false
 attribute[].sortascending true
 attribute[].sortfunction UCA
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
index 93af8783890..87a0e6cfb3d 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
@@ -123,7 +123,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase {
                         "    }\n" +
                         "  }\n" +
                         "}\n");
-        assertFalse(attr.isSwappable());
+        assertFalse(attr.isPaged());
     }
     @Test
     public void requireThatSwappableCanBeSet() throws ParseException {
@@ -132,11 +132,11 @@ public class AttributeSettingsTestCase extends SchemaTestCase {
                         "  document test { \n" +
                         "    field f type int { \n" +
                         "      indexing: attribute \n" +
-                        "      attribute: swappable \n" +
+                        "      attribute: paged \n" +
                         "    }\n" +
                         "  }\n" +
                         "}\n");
-        assertTrue(attr.isSwappable());
+        assertTrue(attr.isPaged());
     }
 
     @Test
@@ -246,7 +246,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase {
         single.setEnableOnlyBitVector(true);
         single.setFastSearch(true);
         single.setHuge(true);
-        single.setSwappable(true);
+        single.setPaged(true);
         single.setFastAccess(true);
         single.setPosition(true);
         single.setArity(5);
@@ -269,7 +269,7 @@ public class AttributeSettingsTestCase extends SchemaTestCase {
         assertTrue(array.isEnabledOnlyBitVector());
         assertTrue(array.isFastSearch());
         assertTrue(array.isHuge());
-        assertTrue(array.isSwappable());
+        assertTrue(array.isPaged());
         assertTrue(array.isFastAccess());
         assertTrue(array.isPosition());
         assertEquals(5, array.arity());