diff --git a/src/main/mondrian/jolap/Converter.java b/src/main/mondrian/jolap/Converter.java
index 4127ada06e..30f5d05b3a 100644
--- a/src/main/mondrian/jolap/Converter.java
+++ b/src/main/mondrian/jolap/Converter.java
@@ -84,7 +84,7 @@ private QueryAxis convert(MondrianEdgeView edgeView, int axisIndex) throws OLAPE
                 }
             }
         }
-        AxisOrdinal axisOrdinal = AxisOrdinal.forOrdinal2(axisIndex);
+        AxisOrdinal axisOrdinal = AxisOrdinal.forLogicalOrdinal(axisIndex);
         return new QueryAxis(false, exp, axisOrdinal,
                 QueryAxis.SubtotalVisibility.Undefined, new Id[0]);
     }
diff --git a/src/main/mondrian/olap/AxisOrdinal.java b/src/main/mondrian/olap/AxisOrdinal.java
index 34a0f080a6..740f24b74a 100644
--- a/src/main/mondrian/olap/AxisOrdinal.java
+++ b/src/main/mondrian/olap/AxisOrdinal.java
@@ -42,7 +42,7 @@ public enum AxisOrdinal {
     /** Sections axis, logical ordinal = 4. */
     SECTIONS;
 
-    public static AxisOrdinal forOrdinal2(int ordinal) {
+    public static AxisOrdinal forLogicalOrdinal(int ordinal) {
         return values()[ordinal + 2];
     }
 
diff --git a/src/main/mondrian/olap/Parser.cup b/src/main/mondrian/olap/Parser.cup
index 4980656456..820da9cfba 100644
--- a/src/main/mondrian/olap/Parser.cup
+++ b/src/main/mondrian/olap/Parser.cup
@@ -1423,7 +1423,7 @@ axis_specification ::=
                         new Integer(AxisOrdinal.MaxLogicalOrdinal), new Double(d));
             }
 
-            AxisOrdinal axis = AxisOrdinal.forOrdinal2(index);
+            AxisOrdinal axis = AxisOrdinal.forLogicalOrdinal(index);
             RESULT = new QueryAxis(b.booleanValue(), s, axis,
                     QueryAxis.SubtotalVisibility.Undefined,
                     Parser.toIdArray(dp));
diff --git a/src/main/mondrian/olap/Query.java b/src/main/mondrian/olap/Query.java
index 34dbbca479..8e0c7d00bf 100644
--- a/src/main/mondrian/olap/Query.java
+++ b/src/main/mondrian/olap/Query.java
@@ -326,7 +326,7 @@ public void setQueryEndExecution() {
 
     private void normalizeAxes() {
         for (int i = 0; i < axes.length; i++) {
-            AxisOrdinal correctOrdinal = AxisOrdinal.forOrdinal2(i);
+            AxisOrdinal correctOrdinal = AxisOrdinal.forLogicalOrdinal(i);
             if (axes[i].getAxisOrdinal() != correctOrdinal) {
                 for (int j = i + 1; j < axes.length; j++) {
                     if (axes[j].getAxisOrdinal() == correctOrdinal) {
diff --git a/src/main/mondrian/xmla/Rowset.java b/src/main/mondrian/xmla/Rowset.java
index 2b6d9af94a..4553e959c4 100644
--- a/src/main/mondrian/xmla/Rowset.java
+++ b/src/main/mondrian/xmla/Rowset.java
@@ -297,7 +297,7 @@ public int compare(E o1, E o2) {
      * If there are no restrictions, always returns true.
     protected boolean passesRestriction(RowsetDefinition.Column column,
             Object value) {
-        final Object requiredValue = restrictions.forOrdinal2(column.name);
+        final Object requiredValue = restrictions.get(column.name);
 
         if (requiredValue == null) {
             return true;
diff --git a/testsrc/main/mondrian/olap/HierarchyBugTest.java b/testsrc/main/mondrian/olap/HierarchyBugTest.java
index 6da9ae137f..7ffc714d26 100644
--- a/testsrc/main/mondrian/olap/HierarchyBugTest.java
+++ b/testsrc/main/mondrian/olap/HierarchyBugTest.java
@@ -52,7 +52,7 @@ public void testNoHierarchy() {
         String failStr = null;
         int len = query.axes.length;
         for (int i = 0; i < len; i++) {
-            Hierarchy[] hs = query.getMdxHierarchiesOnAxis(AxisOrdinal.forOrdinal2(i));
+            Hierarchy[] hs = query.getMdxHierarchiesOnAxis(AxisOrdinal.forLogicalOrdinal(i));
             if (hs == null) {
             } else {
                 for (Hierarchy h : hs) {
diff --git a/testsrc/main/mondrian/olap/ParserTest.java b/testsrc/main/mondrian/olap/ParserTest.java
index 486c61776c..d4f0f93704 100644
--- a/testsrc/main/mondrian/olap/ParserTest.java
+++ b/testsrc/main/mondrian/olap/ParserTest.java
@@ -135,9 +135,9 @@ public void testMultipleAxes() throws Exception {
 
         assertEquals("Number of axes", 2, axes.length);
         assertEquals("Axis index name must be correct",
-            AxisOrdinal.forOrdinal2(0).name(), axes[0].getAxisName());
+            AxisOrdinal.forLogicalOrdinal(0).name(), axes[0].getAxisName());
         assertEquals("Axis index name must be correct",
-            AxisOrdinal.forOrdinal2(1).name(), axes[1].getAxisName());
+            AxisOrdinal.forLogicalOrdinal(1).name(), axes[1].getAxisName());
 
         query = "select {[axis1mbr]} on aXiS(1), "
                 + "{[axis0mbr]} on AxIs(0) from cube";
@@ -147,9 +147,9 @@ public void testMultipleAxes() throws Exception {
 
         assertEquals("Number of axes", 2, axes.length);
         assertEquals("Axis index name must be correct",
-            AxisOrdinal.forOrdinal2(0).name(), axes[0].getAxisName());
+            AxisOrdinal.forLogicalOrdinal(0).name(), axes[0].getAxisName());
         assertEquals("Axis index name must be correct",
-            AxisOrdinal.forOrdinal2(1).name(), axes[1].getAxisName());
+            AxisOrdinal.forLogicalOrdinal(1).name(), axes[1].getAxisName());
 
         Exp colsSetExpr = axes[0].getSet();
         assertNotNull("Column tuples", colsSetExpr);
diff --git a/testsrc/main/mondrian/test/comp/ResultComparator.java b/testsrc/main/mondrian/test/comp/ResultComparator.java
index 3c5eb0f4ef..2cdc1a460d 100644
--- a/testsrc/main/mondrian/test/comp/ResultComparator.java
+++ b/testsrc/main/mondrian/test/comp/ResultComparator.java
@@ -195,7 +195,7 @@ private Element toXml(Result result) {
         final Axis[] axes = result.getAxes();
         for (int i = 0; i < axes.length; i++) {
             Axis axis = axes[i];
-            String axisName = AxisOrdinal.forOrdinal2(i).name().toLowerCase();
+            String axisName = AxisOrdinal.forLogicalOrdinal(i).name().toLowerCase();
             axisToXml(document, dataResultXml, axis, axisName);
         }
         final Element dataXml = document.createElement("data");