diff --git a/adv-simd.h b/adv-simd.h
index 54eec0f1..1cbd67ae 100644
--- a/adv-simd.h
+++ b/adv-simd.h
@@ -335,12 +335,12 @@ inline size_t AdvancedProcessBlocks64_6x2_NEON(F2 func2, F6 func6,
 /// \tparam F1 function to process 1 128-bit block
 /// \tparam F6 function to process 6 128-bit blocks
 /// \tparam W word type of the subkey table
-/// \details AdvancedProcessBlocks128_NEON1x6 processes 6 and 2 NEON SIMD words
+/// \details AdvancedProcessBlocks128_6x1_NEON processes 6 and 2 NEON SIMD words
 ///   at a time.
 /// \details The subkey type is usually word32 or word64. F1 and F6 must use the
 ///   same word type.
 template <typename F1, typename F6, typename W>
-inline size_t AdvancedProcessBlocks128_NEON1x6(F1 func1, F6 func6,
+inline size_t AdvancedProcessBlocks128_6x1_NEON(F1 func1, F6 func6,
             const W *subKeys, size_t rounds, const byte *inBlocks,
             const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags)
 {
diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp
index 4f55f610..ef8a4ade 100644
--- a/rijndael-simd.cpp
+++ b/rijndael-simd.cpp
@@ -341,14 +341,14 @@ ANONYMOUS_NAMESPACE_END
 size_t Rijndael_Enc_AdvancedProcessBlocks_ARMV8(const word32 *subKeys, size_t rounds,
             const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags)
 {
-    return AdvancedProcessBlocks128_NEON1x6(ARMV8_Enc_Block, ARMV8_Enc_6_Blocks,
+    return AdvancedProcessBlocks128_6x1_NEON(ARMV8_Enc_Block, ARMV8_Enc_6_Blocks,
             subKeys, rounds, inBlocks, xorBlocks, outBlocks, length, flags);
 }
 
 size_t Rijndael_Dec_AdvancedProcessBlocks_ARMV8(const word32 *subKeys, size_t rounds,
             const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags)
 {
-    return AdvancedProcessBlocks128_NEON1x6(ARMV8_Dec_Block, ARMV8_Dec_6_Blocks,
+    return AdvancedProcessBlocks128_6x1_NEON(ARMV8_Dec_Block, ARMV8_Dec_6_Blocks,
             subKeys, rounds, inBlocks, xorBlocks, outBlocks, length, flags);
 }