diff --git a/modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/ConditionFrame.java b/modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/ConditionFrame.java
index a57e0e040d..2f6a3827d8 100644
--- a/modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/ConditionFrame.java
+++ b/modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/ConditionFrame.java
@@ -66,8 +66,8 @@ public abstract class ConditionFrame<T extends AbstractCondition> extends Abstra
 
         if (width != null) {
             List<Integer> widthValues = new ArrayList<>();
-            int conditionsColumnsQty = filter != null ? filter.getColumnsCount() : clientConfig.getGenericFilterColumnsCount();
-            for (int i = 1; i <= conditionsColumnsQty; i++) {
+            int conditionsColumnsCount = filter != null ? filter.getColumnsCount() : clientConfig.getGenericFilterColumnsCount();
+            for (int i = 1; i <= conditionsColumnsCount; i++) {
                 widthValues.add(i);
             }
             width.setOptionsList(widthValues);
diff --git a/modules/gui/src/com/haulmont/cuba/gui/window.xsd b/modules/gui/src/com/haulmont/cuba/gui/window.xsd
index 5b2aa9416f..af0272ccff 100644
--- a/modules/gui/src/com/haulmont/cuba/gui/window.xsd
+++ b/modules/gui/src/com/haulmont/cuba/gui/window.xsd
@@ -1286,7 +1286,7 @@
         <xs:attribute name="manualApplyRequired" type="xs:boolean"/>
         <xs:attribute name="editable" type="xs:boolean"/>
         <xs:attribute name="folderActionsEnabled" type="xs:boolean"/>
-        <xs:attribute name="columnsQty" type="xs:int"/>
+        <xs:attribute name="columnsCount" type="xs:int"/>
         <xs:attribute name="collapsable" type="xs:boolean"/>
         <xs:attribute name="collapsed" type="xs:boolean"/>
         <xs:attribute name="defaultMode">
diff --git a/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FilterLoader.java b/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FilterLoader.java
index 405920e2b1..22e22cbd7e 100644
--- a/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FilterLoader.java
+++ b/modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FilterLoader.java
@@ -75,9 +75,9 @@ public class FilterLoader extends AbstractComponentLoader<Filter> {
         String editable = element.attributeValue("editable");
         resultComponent.setEditable(editable == null || Boolean.parseBoolean(editable));
 
-        String columnsQty = element.attributeValue("columnsCount");
-        if (!Strings.isNullOrEmpty(columnsQty)) {
-            resultComponent.setColumnsCount(Integer.parseInt(columnsQty));
+        String columnsCount = element.attributeValue("columnsCount");
+        if (!Strings.isNullOrEmpty(columnsCount)) {
+            resultComponent.setColumnsCount(Integer.parseInt(columnsCount));
         }
 
         String folderActionsEnabled = element.attributeValue("folderActionsEnabled");