diff --git a/docs/changelog.rst b/docs/changelog.rst
index 94ca6276a..e0a1a2acd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 v0.5.0
 ======
 
+*   Renaming ``MatrixDiagonal::AsDiagonal`` -> ``MatrixDiagonal::Todiagonal``
+    to maintain API consistency.
 *   Adding ``Mesh::elemmap2nodemap``. Updating Python API.
 *   Adding ``roll`` to FineLayer
 *   Adding ``Mesh::centers`` and ``Mesh::defaultElementType``
diff --git a/docs/examples/dynamics/Elastic-VelocityVerlet/main.cpp b/docs/examples/dynamics/Elastic-VelocityVerlet/main.cpp
index bd2d2d21c..16359c5d4 100644
--- a/docs/examples/dynamics/Elastic-VelocityVerlet/main.cpp
+++ b/docs/examples/dynamics/Elastic-VelocityVerlet/main.cpp
@@ -83,7 +83,7 @@ int main()
 
     M.assemble(nodalQuad.Int_N_scalar_NT_dV(rho));
 
-    xt::xtensor<double, 1> mass = M.AsDiagonal();
+    xt::xtensor<double, 1> mass = M.Todiagonal();
 
     // update in macroscopic deformation gradient
 
diff --git a/docs/examples/dynamics/Elastic-Verlet/main.cpp b/docs/examples/dynamics/Elastic-Verlet/main.cpp
index 8ba939934..05739c18a 100644
--- a/docs/examples/dynamics/Elastic-Verlet/main.cpp
+++ b/docs/examples/dynamics/Elastic-Verlet/main.cpp
@@ -83,7 +83,7 @@ int main()
 
     M.assemble(nodalQuad.Int_N_scalar_NT_dV(rho));
 
-    xt::xtensor<double, 1> mass = M.AsDiagonal();
+    xt::xtensor<double, 1> mass = M.Todiagonal();
 
     // update in macroscopic deformation gradient
 
diff --git a/python/MatrixDiagonal.hpp b/python/MatrixDiagonal.hpp
index fbdf0b431..f9ad8aa84 100644
--- a/python/MatrixDiagonal.hpp
+++ b/python/MatrixDiagonal.hpp
@@ -42,8 +42,8 @@ void init_MatrixDiagonal(py::module& m)
         .def("dofs", &GooseFEM::MatrixDiagonal::dofs, "Return degrees-of-freedom")
 
         .def(
-            "AsDiagonal",
-            &GooseFEM::MatrixDiagonal::AsDiagonal,
+            "Todiagonal",
+            &GooseFEM::MatrixDiagonal::Todiagonal,
             "Return as diagonal matrix (column)")
 
         .def(
diff --git a/test/basic/ElementHex8.cpp b/test/basic/ElementHex8.cpp
index 4376c3ab3..caf1373ef 100644
--- a/test/basic/ElementHex8.cpp
+++ b/test/basic/ElementHex8.cpp
@@ -102,7 +102,7 @@ TEST_CASE("GooseFEM::ElementHex8", "ElementHex8.h")
         xt::xtensor<double, 2> rho = xt::ones<double>({mesh.nelem(), quad.nip()});
 
         mat.assemble(quad.Int_N_scalar_NT_dV(rho));
-        auto M = mat.AsDiagonal();
+        auto M = mat.Todiagonal();
 
         REQUIRE(M.size() == vec.ndof());
         REQUIRE(xt::allclose(M, 1.));
diff --git a/test/basic/ElementQuad4.cpp b/test/basic/ElementQuad4.cpp
index 406487d20..d0e7c408c 100644
--- a/test/basic/ElementQuad4.cpp
+++ b/test/basic/ElementQuad4.cpp
@@ -90,7 +90,7 @@ TEST_CASE("GooseFEM::ElementQuad4", "ElementQuad4.h")
         xt::xtensor<double, 2> rho = xt::ones<double>({mesh.nelem(), quad.nip()});
 
         mat.assemble(quad.Int_N_scalar_NT_dV(rho));
-        auto M = mat.AsDiagonal();
+        auto M = mat.Todiagonal();
 
         REQUIRE(M.size() == vec.ndof());
         REQUIRE(xt::allclose(M, 1.));