diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 1af96b2db..959571293 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -36,8 +36,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$g")
+        #pragma const_seg(".fipsB$g")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/cmac.c b/wolfcrypt/src/cmac.c
index e6fddd200..cd146209a 100644
--- a/wolfcrypt/src/cmac.c
+++ b/wolfcrypt/src/cmac.c
@@ -35,8 +35,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$n")
+        #pragma const_seg(".fipsB$n")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/des3.c b/wolfcrypt/src/des3.c
index 33576e0ff..0a2b7ae7a 100644
--- a/wolfcrypt/src/des3.c
+++ b/wolfcrypt/src/des3.c
@@ -38,8 +38,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$i")
+        #pragma const_seg(".fipsB$i")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/dh.c b/wolfcrypt/src/dh.c
index 2701af3d7..51ffd1a75 100644
--- a/wolfcrypt/src/dh.c
+++ b/wolfcrypt/src/dh.c
@@ -35,8 +35,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$m")
+        #pragma const_seg(".fipsB$m")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index 9801a51c5..7ad3b6801 100755
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -98,8 +98,8 @@ ECC Curve Sizes:
     #define FIPS_NO_WRAPPERS
 
 	#ifdef USE_WINDOWS_API
-		#pragma code_seg(".fipsA$e2")
-		#pragma const_seg(".fipsB$e2")
+		#pragma code_seg(".fipsA$f")
+		#pragma const_seg(".fipsB$f")
 	#endif
 #endif
 
diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c
index b98fa6516..58b782cc0 100644
--- a/wolfcrypt/src/random.c
+++ b/wolfcrypt/src/random.c
@@ -39,8 +39,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$c")
+        #pragma const_seg(".fipsB$c")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/sha.c b/wolfcrypt/src/sha.c
index 548fd0f20..6f1854a15 100644
--- a/wolfcrypt/src/sha.c
+++ b/wolfcrypt/src/sha.c
@@ -35,8 +35,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$j")
+        #pragma const_seg(".fipsB$j")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/sha3.c b/wolfcrypt/src/sha3.c
index 721bb45a1..88d1c2533 100644
--- a/wolfcrypt/src/sha3.c
+++ b/wolfcrypt/src/sha3.c
@@ -35,8 +35,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$l")
+        #pragma const_seg(".fipsB$l")
     #endif
 #endif
 
diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c
index b50d8528d..28d8eda2d 100644
--- a/wolfcrypt/src/sha512.c
+++ b/wolfcrypt/src/sha512.c
@@ -35,8 +35,8 @@
     #define FIPS_NO_WRAPPERS
 
     #ifdef USE_WINDOWS_API
-        #pragma code_seg(".fipsA$d")
-        #pragma const_seg(".fipsB$d")
+        #pragma code_seg(".fipsA$k")
+        #pragma const_seg(".fipsB$k")
     #endif
 #endif