diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 3ce0fbcde..220eec17d 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -1094,12 +1094,12 @@ void AES_CBC_encrypt(const unsigned char* in, unsigned char* out,
                      XASM_LINK("AES_CBC_encrypt");
 
 #ifdef HAVE_AES_DECRYPT
-#if defined(HAVE_AES_DECRYPT_BY8)
+#if defined(WOLFSSL_AESNI_BY4)
 void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
                      unsigned char* ivec, unsigned long length,
                      const unsigned char* KS, int nr)
-                     XASM_LINK("AES_CBC_decrypt_by8");
-#elif defined(HAVE_AES_DECRYPT_BY6)
+                     XASM_LINK("AES_CBC_decrypt_by4");
+#elif defined(WOLFSSL_AESNI_BY6)
 void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
                      unsigned char* ivec, unsigned long length,
                      const unsigned char* KS, int nr)
@@ -1108,8 +1108,8 @@ void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
 void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
                      unsigned char* ivec, unsigned long length,
                      const unsigned char* KS, int nr)
-                     XASM_LINK("AES_CBC_decrypt");
-#endif /* HAVE_AES_DECRYPT_BYX */
+                     XASM_LINK("AES_CBC_decrypt_by8");
+#endif /* WOLFSSL_AESNI_BYx */
 #endif /* HAVE_AES_DECRYPT */
 #endif /* HAVE_AES_CBC */
 
diff --git a/wolfcrypt/src/aes_asm.s b/wolfcrypt/src/aes_asm.s
index 208e52dc5..85863d3d7 100644
--- a/wolfcrypt/src/aes_asm.s
+++ b/wolfcrypt/src/aes_asm.s
@@ -86,18 +86,18 @@ jne	LOOP
 ret
 
 
-
+#if defined(WOLFSSL_AESNI_BY4)
 
 /*
-AES_CBC_decrypt (const unsigned char *in,
+AES_CBC_decrypt_by4 (const unsigned char *in,
   unsigned char *out,
   unsigned char ivec[16],
   unsigned long length,
   const unsigned char *KS,
   int nr)
 */
-.globl AES_CBC_decrypt
-AES_CBC_decrypt:
+.globl AES_CBC_decrypt_by4
+AES_CBC_decrypt_by4:
 # parameter 1: %rdi
 # parameter 2: %rsi
 # parameter 3: %rdx
@@ -262,6 +262,7 @@ DLAST_4_2:
 DEND_4:
         ret
 
+#elif defined(WOLFSSL_AESNI_BY6)
 
 /*
 AES_CBC_decrypt_by6 (const unsigned char *in,
@@ -484,6 +485,7 @@ ELAST_6_2:
 EEND_6:
         ret
 
+#else /* WOLFSSL_AESNI_BYx */
 
 /*
 AES_CBC_decrypt_by8 (const unsigned char *in,
@@ -734,6 +736,8 @@ ELAST_8_2:
 EEND_8:
         ret
 
+#endif /* WOLFSSL_AESNI_BYx */
+
 
 /*
 AES_ECB_encrypt (const unsigned char *in,