diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh
index 0f5ea756..71bfaa58 100755
--- a/TestScripts/cryptest.sh
+++ b/TestScripts/cryptest.sh
@@ -1310,30 +1310,30 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vld')
 			if [[ ("$COUNT" -lt "8") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected NEON load instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON load instructions" | tee -a "$TEST_RESULTS"
 			fi
 		else  # ARMv7
-			# ARIA::UncheckedKeySet: 8 vld1.32 {d1,d2}
+			# ARIA::UncheckedKeySet: 6 vld1.32 {d1,d2}
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vld1.32[[:space:]]*{')
 			if [[ ("$COUNT" -lt "6") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected vector load instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON load instructions" | tee -a "$TEST_RESULTS"
 			fi
 		fi
 
 		if [[ ("$HAVE_ARMV8A") ]]; then
-			# ARIA::UncheckedKeySet: 24 vstr1q.32
+			# ARIA::UncheckedKeySet: 20 vstr1q.32
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vst')
 			if [[ ("$COUNT" -lt "20") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected vector store instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS"
 			fi
 		else
-			# ARIA::UncheckedKeySet: 24 vstr1.32 {d1,d2}
+			# ARIA::UncheckedKeySet: 16 vstr1.32 {d1,d2}
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vst1.32[[:space:]]*{')
 			if [[ ("$COUNT" -lt "16") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected vector store instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS"
 			fi
 		fi
 
@@ -1341,25 +1341,25 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vshl')
 		if [[ ("$COUNT" -lt "17") ]]; then
 			FAILED=1
-			echo "ERROR: failed to generate expected vector shift left instructions" | tee -a "$TEST_RESULTS"
+			echo "ERROR: failed to generate NEON shift left instructions" | tee -a "$TEST_RESULTS"
 		fi
 
 		# ARIA::UncheckedKeySet: 17 vshr.32
 		COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vshl')
 		if [[ ("$COUNT" -lt "17") ]]; then
 			FAILED=1
-			echo "ERROR: failed to generate expected vector shift right instructions" | tee -a "$TEST_RESULTS"
+			echo "ERROR: failed to generate NEON shift right instructions" | tee -a "$TEST_RESULTS"
 		fi
 
 		# ARIA::UncheckedKeySet: 34 veor
 		COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'eor.*v|veor')
 		if [[ ("$COUNT" -lt "34") ]]; then
 			FAILED=1
-			echo "ERROR: failed to generate expected vector xor instructions" | tee -a "$TEST_RESULTS"
+			echo "ERROR: failed to generate NEON xor instructions" | tee -a "$TEST_RESULTS"
 		fi
 
 		if [[ ("$FAILED" -eq "0") ]]; then
-			echo "Verified vector load, store, shfit left, shift right, xor machine instructions" | tee -a "$TEST_RESULTS"
+			echo "Verified NEON load, store, shfit left, shift right, xor machine instructions" | tee -a "$TEST_RESULTS"
 		fi
 	fi
 
diff --git a/cryptest.sh b/cryptest.sh
index 0f5ea756..71bfaa58 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -1310,30 +1310,30 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vld')
 			if [[ ("$COUNT" -lt "8") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected NEON load instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON load instructions" | tee -a "$TEST_RESULTS"
 			fi
 		else  # ARMv7
-			# ARIA::UncheckedKeySet: 8 vld1.32 {d1,d2}
+			# ARIA::UncheckedKeySet: 6 vld1.32 {d1,d2}
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vld1.32[[:space:]]*{')
 			if [[ ("$COUNT" -lt "6") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected vector load instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON load instructions" | tee -a "$TEST_RESULTS"
 			fi
 		fi
 
 		if [[ ("$HAVE_ARMV8A") ]]; then
-			# ARIA::UncheckedKeySet: 24 vstr1q.32
+			# ARIA::UncheckedKeySet: 20 vstr1q.32
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vst')
 			if [[ ("$COUNT" -lt "20") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected vector store instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS"
 			fi
 		else
-			# ARIA::UncheckedKeySet: 24 vstr1.32 {d1,d2}
+			# ARIA::UncheckedKeySet: 16 vstr1.32 {d1,d2}
 			COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vst1.32[[:space:]]*{')
 			if [[ ("$COUNT" -lt "16") ]]; then
 				FAILED=1
-				echo "ERROR: failed to generate expected vector store instructions" | tee -a "$TEST_RESULTS"
+				echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS"
 			fi
 		fi
 
@@ -1341,25 +1341,25 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vshl')
 		if [[ ("$COUNT" -lt "17") ]]; then
 			FAILED=1
-			echo "ERROR: failed to generate expected vector shift left instructions" | tee -a "$TEST_RESULTS"
+			echo "ERROR: failed to generate NEON shift left instructions" | tee -a "$TEST_RESULTS"
 		fi
 
 		# ARIA::UncheckedKeySet: 17 vshr.32
 		COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vshl')
 		if [[ ("$COUNT" -lt "17") ]]; then
 			FAILED=1
-			echo "ERROR: failed to generate expected vector shift right instructions" | tee -a "$TEST_RESULTS"
+			echo "ERROR: failed to generate NEON shift right instructions" | tee -a "$TEST_RESULTS"
 		fi
 
 		# ARIA::UncheckedKeySet: 34 veor
 		COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'eor.*v|veor')
 		if [[ ("$COUNT" -lt "34") ]]; then
 			FAILED=1
-			echo "ERROR: failed to generate expected vector xor instructions" | tee -a "$TEST_RESULTS"
+			echo "ERROR: failed to generate NEON xor instructions" | tee -a "$TEST_RESULTS"
 		fi
 
 		if [[ ("$FAILED" -eq "0") ]]; then
-			echo "Verified vector load, store, shfit left, shift right, xor machine instructions" | tee -a "$TEST_RESULTS"
+			echo "Verified NEON load, store, shfit left, shift right, xor machine instructions" | tee -a "$TEST_RESULTS"
 		fi
 	fi