diff --git a/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorSymmetricMatrixStorage.cs b/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorSymmetricMatrixStorage.cs
index c58279b6..0c273907 100644
--- a/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorSymmetricMatrixStorage.cs
+++ b/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorSymmetricMatrixStorage.cs
@@ -54,7 +54,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
         /// <remarks>Not range-checked.</remarks>
         public override T At(int row, int column)
         {
-            return Data[Indexer.IndexOf(row, column)];
+            return Data[Indexer.Of(row, column)];
         }
 
         /// <summary>
@@ -66,7 +66,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
         /// <remarks>WARNING: This method is not thread safe. Use "lock" with it and be sure to avoid deadlocks.</remarks>
         public override void At(int row, int column, T value)
         {
-            Data[Indexer.IndexOf(row, column)] = value;
+            Data[Indexer.Of(row, column)] = value;
         }
 
         public override void Clear()
diff --git a/src/Numerics/LinearAlgebra/Storage/Indexers/IStorageIndexer.cs b/src/Numerics/LinearAlgebra/Storage/Indexers/IStorageIndexer.cs
index 7b86b5fc..7a7e5975 100644
--- a/src/Numerics/LinearAlgebra/Storage/Indexers/IStorageIndexer.cs
+++ b/src/Numerics/LinearAlgebra/Storage/Indexers/IStorageIndexer.cs
@@ -14,7 +14,7 @@
         ///  </param><returns>
         ///  The requested index. 
         /// </returns>
-        int IndexOf(int row, int column);
+        int Of(int row, int column);
 
         /// <summary>
         ///  Retrieves the index of the requested diagonal element without parameter checking.
@@ -23,6 +23,6 @@
         ///  </param><returns>
         ///  The requested index. 
         /// </returns>
-        int IndexOfDiagonal(int row);
+        int OfDiagonal(int row);
     }
 }
diff --git a/src/Numerics/LinearAlgebra/Storage/Indexers/Static/PackedStorageIndexerUpper.cs b/src/Numerics/LinearAlgebra/Storage/Indexers/Static/PackedStorageIndexerUpper.cs
index d9e91bc2..9989b864 100644
--- a/src/Numerics/LinearAlgebra/Storage/Indexers/Static/PackedStorageIndexerUpper.cs
+++ b/src/Numerics/LinearAlgebra/Storage/Indexers/Static/PackedStorageIndexerUpper.cs
@@ -29,7 +29,7 @@
         ///   The column of the element.
         /// </param>
         /// <remarks>
-        ///   This method is parameter checked. <see cref = "IndexOf(int,int)" /> and <see cref = "IndexOfDiagonal(int)" /> to get values without parameter checking.
+        ///   This method is parameter checked. <see cref = "Of" /> and <see cref = "OfDiagonal" /> to get values without parameter checking.
         /// </remarks>
         public override int this[int row, int column]
         {
@@ -50,7 +50,7 @@
                     throw new ArgumentException("Row must be less than or equal to column");
                 }
 
-                return IndexOf(row, column);
+                return this.Of(row, column);
             }
         }
 
@@ -66,7 +66,7 @@
         /// <returns>
         /// The requested index. 
         /// </returns>
-        public override int IndexOf(int row, int column)
+        public override int Of(int row, int column)
         {
             return row + ((column * (column + 1)) / 2);
         }
@@ -80,7 +80,7 @@
         /// <returns>
         /// The requested index. 
         /// </returns>
-        public override int IndexOfDiagonal(int row)
+        public override int OfDiagonal(int row)
         {
             return (row * (row + 3)) / 2;
         }
diff --git a/src/Numerics/LinearAlgebra/Storage/Indexers/Static/StaticStorageIndexer.cs b/src/Numerics/LinearAlgebra/Storage/Indexers/Static/StaticStorageIndexer.cs
index 5237ab96..d447fbee 100644
--- a/src/Numerics/LinearAlgebra/Storage/Indexers/Static/StaticStorageIndexer.cs
+++ b/src/Numerics/LinearAlgebra/Storage/Indexers/Static/StaticStorageIndexer.cs
@@ -18,7 +18,7 @@
         ///   The column of the element.
         /// </param>
         /// <remarks>
-        ///   This method is parameter checked. <see cref = "IStorageIndexer.IndexOf(int,int)" /> and <see cref = "IStorageIndexer.IndexOfDiagonal(int)" /> to get values without parameter checking.
+        ///   This method is parameter checked. <see cref = "IStorageIndexer.Of" /> and <see cref = "IStorageIndexer.OfDiagonal" /> to get values without parameter checking.
         /// </remarks>
         public abstract int this[int row, int column]
         {
@@ -42,7 +42,7 @@
         ///  </param><returns>
         ///  The requested index. 
         /// </returns>
-        public abstract int IndexOf(int row, int column);
+        public abstract int Of(int row, int column);
 
         /// <summary>
         ///  Retrieves the index of the requested diagonal element without parameter checking.
@@ -51,6 +51,6 @@
         ///  </param><returns>
         ///  The requested index. 
         /// </returns>
-        public abstract int IndexOfDiagonal(int row);
+        public abstract int OfDiagonal(int row);
     }
 }