diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index f0c7609..6fcbc26 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -5,8 +5,8 @@
  * or disable features selectively, and reduce the global
  * memory footprint.
  */
-#ifndef XYSSL_CONFIG_H
-#define XYSSL_CONFIG_H
+#ifndef POLARSSL_CONFIG_H
+#define POLARSSL_CONFIG_H
 
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE 1
@@ -15,51 +15,51 @@
 /*
  * Uncomment if native integers are 8-bit wide.
  *
-#define XYSSL_HAVE_INT8
+#define POLARSSL_HAVE_INT8
  */
 
 /*
  * Uncomment if native integers are 16-bit wide.
  *
-#define XYSSL_HAVE_INT16
+#define POLARSSL_HAVE_INT16
  */
 
 /*
  * Uncomment if the compiler supports long long.
  *
-#define XYSSL_HAVE_LONGLONG
+#define POLARSSL_HAVE_LONGLONG
  */
 
 /*
  * Uncomment to enable the use of assembly code.
  */
-#define XYSSL_HAVE_ASM
+#define POLARSSL_HAVE_ASM
 
 /*
  * Uncomment if the CPU supports SSE2 (IA-32 specific).
  *
-#define XYSSL_HAVE_SSE2
+#define POLARSSL_HAVE_SSE2
  */
 
 /*
  * Enable all SSL/TLS debugging messages.
  */
-#define XYSSL_DEBUG_MSG
+#define POLARSSL_DEBUG_MSG
 
 /*
  * Enable the checkup functions (*_self_test).
  */
-#define XYSSL_SELF_TEST
+#define POLARSSL_SELF_TEST
 
 /*
  * Enable the prime-number generation code.
  */
-#define XYSSL_GENPRIME
+#define POLARSSL_GENPRIME
 
 /*
  * Uncomment this macro to store the AES tables in ROM.
  *
-#define XYSSL_AES_ROM_TABLES
+#define POLARSSL_AES_ROM_TABLES
  */
 
 /*
@@ -71,7 +71,7 @@
  *      SSL_RSA_AES_256_SHA
  *      SSL_EDH_RSA_AES_256_SHA
  */
-#define XYSSL_AES_C
+#define POLARSSL_AES_C
 
 /*
  * Module:  library/arc4.c
@@ -81,7 +81,7 @@
  *      SSL_RSA_RC4_128_MD5
  *      SSL_RSA_RC4_128_SHA
  */
-#define XYSSL_ARC4_C
+#define POLARSSL_ARC4_C
 
 /*
  * Module:  library/base64.c
@@ -89,7 +89,7 @@
  *
  * This module is required for X.509 support.
  */
-#define XYSSL_BASE64_C
+#define POLARSSL_BASE64_C
 
 /*
  * Module:  library/bignum.c
@@ -100,7 +100,7 @@
  *
  * This module is required for RSA and DHM support.
  */
-#define XYSSL_BIGNUM_C
+#define POLARSSL_BIGNUM_C
 
 /*
  * Module:  library/certs.c
@@ -108,7 +108,7 @@
  *
  * This module is used for testing (ssl_client/server).
  */
-#define XYSSL_CERTS_C
+#define POLARSSL_CERTS_C
 
 /*
  * Module:  library/debug.c
@@ -118,7 +118,7 @@
  *
  * This module provides debugging functions.
  */
-#define XYSSL_DEBUG_C
+#define POLARSSL_DEBUG_C
 
 /*
  * Module:  library/des.c
@@ -128,7 +128,7 @@
  *      SSL_RSA_DES_168_SHA
  *      SSL_EDH_RSA_DES_168_SHA
  */
-#define XYSSL_DES_C
+#define POLARSSL_DES_C
 
 /*
  * Module:  library/dhm.c
@@ -139,7 +139,7 @@
  *      SSL_EDH_RSA_DES_168_SHA
  *      SSL_EDH_RSA_AES_256_SHA
  */
-#define XYSSL_DHM_C
+#define POLARSSL_DHM_C
 
 /*
  * Module:  library/havege.c
@@ -147,7 +147,7 @@
  *
  * This module enables the HAVEGE random number generator.
  */
-#define XYSSL_HAVEGE_C
+#define POLARSSL_HAVEGE_C
 
 /*
  * Module:  library/md2.c
@@ -155,7 +155,7 @@
  *
  * Uncomment to enable support for (rare) MD2-signed X.509 certs.
  *
-#define XYSSL_MD2_C
+#define POLARSSL_MD2_C
  */
 
 /*
@@ -164,7 +164,7 @@
  *
  * Uncomment to enable support for (rare) MD4-signed X.509 certs.
  *
-#define XYSSL_MD4_C
+#define POLARSSL_MD4_C
  */
 
 /*
@@ -174,7 +174,7 @@
  *
  * This module is required for SSL/TLS and X.509.
  */
-#define XYSSL_MD5_C
+#define POLARSSL_MD5_C
 
 /*
  * Module:  library/net.c
@@ -182,7 +182,7 @@
  *
  * This module provides TCP/IP networking routines.
  */
-#define XYSSL_NET_C
+#define POLARSSL_NET_C
 
 /*
  * Module:  library/padlock.c
@@ -190,7 +190,7 @@
  *
  * This modules adds support for the VIA PadLock on x86.
  */
-#define XYSSL_PADLOCK_C
+#define POLARSSL_PADLOCK_C
 
 /*
  * Module:  library/rsa.c
@@ -201,7 +201,7 @@
  *
  * This module is required for SSL/TLS and MD5-signed certificates.
  */
-#define XYSSL_RSA_C
+#define POLARSSL_RSA_C
 
 /*
  * Module:  library/sha1.c
@@ -212,7 +212,7 @@
  *
  * This module is required for SSL/TLS and SHA1-signed certificates.
  */
-#define XYSSL_SHA1_C
+#define POLARSSL_SHA1_C
 
 /*
  * Module:  library/sha2.c
@@ -220,7 +220,7 @@
  *
  * This module adds support for SHA-224 and SHA-256.
  */
-#define XYSSL_SHA2_C
+#define POLARSSL_SHA2_C
 
 /*
  * Module:  library/sha4.c
@@ -228,7 +228,7 @@
  *
  * This module adds support for SHA-384 and SHA-512.
  */
-#define XYSSL_SHA4_C
+#define POLARSSL_SHA4_C
 
 /*
  * Module:  library/ssl_cli.c
@@ -236,7 +236,7 @@
  *
  * This module is required for SSL/TLS client support.
  */
-#define XYSSL_SSL_CLI_C
+#define POLARSSL_SSL_CLI_C
 
 /*
  * Module:  library/ssl_srv.c
@@ -244,7 +244,7 @@
  *
  * This module is required for SSL/TLS server support.
  */
-#define XYSSL_SSL_SRV_C
+#define POLARSSL_SSL_SRV_C
 
 /*
  * Module:  library/ssl_tls.c
@@ -253,7 +253,7 @@
  *
  * This module is required for SSL/TLS.
  */
-#define XYSSL_SSL_TLS_C
+#define POLARSSL_SSL_TLS_C
 
 /*
  * Module:  library/timing.c
@@ -261,7 +261,7 @@
  *
  * This module is used by the HAVEGE random number generator.
  */
-#define XYSSL_TIMING_C
+#define POLARSSL_TIMING_C
 
 /*
  * Module:  library/x509parse.c
@@ -271,7 +271,7 @@
  *
  * This module is required for X.509 certificate parsing.
  */
-#define XYSSL_X509_PARSE_C
+#define POLARSSL_X509_PARSE_C
 
 /*
  * Module:  library/x509_write.c
@@ -279,6 +279,6 @@
  *
  * This module is required for X.509 certificate writing.
  */
-#define XYSSL_X509_WRITE_C
+#define POLARSSL_X509_WRITE_C
 
 #endif /* config.h */