diff --git a/Source/BasicMathFunctions/arm_and_u16.c b/Source/BasicMathFunctions/arm_and_u16.c
index 33468047..f7c57eb1 100644
--- a/Source/BasicMathFunctions/arm_and_u16.c
+++ b/Source/BasicMathFunctions/arm_and_u16.c
@@ -63,7 +63,7 @@ void arm_and_u16(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q15x8_t vecSrcA, vecSrcB;
+    uint16x8_t vecSrcA, vecSrcB;
 
     /* Compute 8 outputs at a time */
     blkCnt = blockSize >> 3;
diff --git a/Source/BasicMathFunctions/arm_and_u32.c b/Source/BasicMathFunctions/arm_and_u32.c
index 7da36247..e3c0181b 100644
--- a/Source/BasicMathFunctions/arm_and_u32.c
+++ b/Source/BasicMathFunctions/arm_and_u32.c
@@ -55,7 +55,7 @@ void arm_and_u32(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q31x4_t vecSrcA, vecSrcB;
+    uint32x4_t vecSrcA, vecSrcB;
 
     /* Compute 4 outputs at a time */
     blkCnt = blockSize >> 2;
diff --git a/Source/BasicMathFunctions/arm_and_u8.c b/Source/BasicMathFunctions/arm_and_u8.c
index 981181a5..4f6d195b 100644
--- a/Source/BasicMathFunctions/arm_and_u8.c
+++ b/Source/BasicMathFunctions/arm_and_u8.c
@@ -56,7 +56,7 @@ void arm_and_u8(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q7x16_t vecSrcA, vecSrcB;
+    uint8x16_t vecSrcA, vecSrcB;
 
     /* Compute 16 outputs at a time */
     blkCnt = blockSize >> 4;
diff --git a/Source/BasicMathFunctions/arm_not_u16.c b/Source/BasicMathFunctions/arm_not_u16.c
index a2115841..ceb8a139 100644
--- a/Source/BasicMathFunctions/arm_not_u16.c
+++ b/Source/BasicMathFunctions/arm_not_u16.c
@@ -61,7 +61,7 @@ void arm_not_u16(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q15x8_t vecSrc;
+    uint16x8_t vecSrc;
 
     /* Compute 8 outputs at a time */
     blkCnt = blockSize >> 3;
diff --git a/Source/BasicMathFunctions/arm_not_u32.c b/Source/BasicMathFunctions/arm_not_u32.c
index 3a304448..09cf0a05 100644
--- a/Source/BasicMathFunctions/arm_not_u32.c
+++ b/Source/BasicMathFunctions/arm_not_u32.c
@@ -53,7 +53,7 @@ void arm_not_u32(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q31x4_t vecSrc;
+    uint32x4_t vecSrc;
 
     /* Compute 8 outputs at a time */
     blkCnt = blockSize >> 2;
diff --git a/Source/BasicMathFunctions/arm_not_u8.c b/Source/BasicMathFunctions/arm_not_u8.c
index 91939dc0..a6fb1d45 100644
--- a/Source/BasicMathFunctions/arm_not_u8.c
+++ b/Source/BasicMathFunctions/arm_not_u8.c
@@ -53,7 +53,7 @@ void arm_not_u8(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q7x16_t vecSrc;
+    uint8x16_t vecSrc;
 
     /* Compute 16 outputs at a time */
     blkCnt = blockSize >> 4;
diff --git a/Source/BasicMathFunctions/arm_or_u16.c b/Source/BasicMathFunctions/arm_or_u16.c
index bcb6de37..059b0db3 100644
--- a/Source/BasicMathFunctions/arm_or_u16.c
+++ b/Source/BasicMathFunctions/arm_or_u16.c
@@ -63,7 +63,7 @@ void arm_or_u16(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q15x8_t vecSrcA, vecSrcB;
+    uint16x8_t vecSrcA, vecSrcB;
 
     /* Compute 8 outputs at a time */
     blkCnt = blockSize >> 3;
diff --git a/Source/BasicMathFunctions/arm_or_u32.c b/Source/BasicMathFunctions/arm_or_u32.c
index 2dfcda8e..97c42405 100644
--- a/Source/BasicMathFunctions/arm_or_u32.c
+++ b/Source/BasicMathFunctions/arm_or_u32.c
@@ -55,7 +55,7 @@ void arm_or_u32(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q31x4_t vecSrcA, vecSrcB;
+    uint32x4_t vecSrcA, vecSrcB;
 
     /* Compute 4 outputs at a time */
     blkCnt = blockSize >> 2;
diff --git a/Source/BasicMathFunctions/arm_or_u8.c b/Source/BasicMathFunctions/arm_or_u8.c
index a54950ad..d2b23eea 100644
--- a/Source/BasicMathFunctions/arm_or_u8.c
+++ b/Source/BasicMathFunctions/arm_or_u8.c
@@ -55,7 +55,7 @@ void arm_or_u8(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q7x16_t vecSrcA, vecSrcB;
+    uint8x16_t vecSrcA, vecSrcB;
 
     /* Compute 16 outputs at a time */
     blkCnt = blockSize >> 4;
diff --git a/Source/BasicMathFunctions/arm_xor_u16.c b/Source/BasicMathFunctions/arm_xor_u16.c
index d4736b0b..2ccace6a 100644
--- a/Source/BasicMathFunctions/arm_xor_u16.c
+++ b/Source/BasicMathFunctions/arm_xor_u16.c
@@ -63,7 +63,7 @@ void arm_xor_u16(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q15x8_t vecSrcA, vecSrcB;
+    uint16x8_t vecSrcA, vecSrcB;
 
     /* Compute 8 outputs at a time */
     blkCnt = blockSize >> 3;
diff --git a/Source/BasicMathFunctions/arm_xor_u32.c b/Source/BasicMathFunctions/arm_xor_u32.c
index d35a658c..8a7f3b25 100644
--- a/Source/BasicMathFunctions/arm_xor_u32.c
+++ b/Source/BasicMathFunctions/arm_xor_u32.c
@@ -55,7 +55,7 @@ void arm_xor_u32(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q31x4_t vecSrcA, vecSrcB;
+    uint32x4_t vecSrcA, vecSrcB;
 
     /* Compute 4 outputs at a time */
     blkCnt = blockSize >> 2;
diff --git a/Source/BasicMathFunctions/arm_xor_u8.c b/Source/BasicMathFunctions/arm_xor_u8.c
index 5262e9e8..4eaf8677 100644
--- a/Source/BasicMathFunctions/arm_xor_u8.c
+++ b/Source/BasicMathFunctions/arm_xor_u8.c
@@ -55,7 +55,7 @@ void arm_xor_u8(
     uint32_t blkCnt;      /* Loop counter */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
-    q7x16_t vecSrcA, vecSrcB;
+    uint8x16_t vecSrcA, vecSrcB;
 
     /* Compute 16 outputs at a time */
     blkCnt = blockSize >> 4;