diff --git a/cyassl/ssl.h b/cyassl/ssl.h
index 9b36a4e9c..d6b341e17 100644
--- a/cyassl/ssl.h
+++ b/cyassl/ssl.h
@@ -147,6 +147,11 @@
 #define cyassl_chacha                  wolfssl_chacha
 #define cyassl_rc4                     wolfssl_rc4
 #define cyassl_aes                     wolfssl_aes
+/* fips defines */
+#define WOLFSSL_GENERAL_ALIGNMENT      CYASSL_GENERAL_ALIGNMENT
+#define WOLFSSL_LEAVE                  CYASSL_LEAVE
+#define WOLFSSL_ERROR                  CYASSL_ERROR
+#define wolfcrypt_test                 ctaocrypt_test
 
 /* keys.c */
 #define cyassl_triple_des wolfssl_triple_des
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
index ae2adbb8e..6f4b20b4b 100644
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -19,8 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <cyassl/ctaocrypt/types.h>
+/* Name change compatibility layer */
+#include <cyassl/ssl.h>
 
+
+#include <cyassl/ctaocrypt/types.h>
 // #if !defined(WOLF_CRYPT_TYPES_H) && !defined(CTAO_CRYPT_TYPES_H)
 // #define WOLF_CRYPT_TYPES_H