diff --git a/rijndael.cpp b/rijndael.cpp
index df551109..55bf6510 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -1126,7 +1126,7 @@ void Rijndael_Enc_AdvancedProcessBlocks(void *locals, const word32 *k);
 }
 #endif
 
-#if CRYPTOPP_ENABLE_ADVANCED_PROCESS_BLOCKS
+#if CRYPTOPP_RIJNDAEL_ADVANCED_PROCESS_BLOCKS
 size_t Rijndael::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const
 {
 #if CRYPTOPP_AESNI_AVAILABLE
@@ -1212,7 +1212,7 @@ size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte *xo
 
 	return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags);
 }
-#endif	// CRYPTOPP_ENABLE_ADVANCED_PROCESS_BLOCKS
+#endif	// CRYPTOPP_RIJNDAEL_ADVANCED_PROCESS_BLOCKS
 
 NAMESPACE_END
 
diff --git a/rijndael.h b/rijndael.h
index 952c0ba6..61e3c5f3 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -15,7 +15,7 @@
 
 #if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_ARM32 || \
 	CRYPTOPP_BOOL_ARM64 || CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64
-# define CRYPTOPP_ENABLE_ADVANCED_PROCESS_BLOCKS 1
+# define CRYPTOPP_RIJNDAEL_ADVANCED_PROCESS_BLOCKS 1
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)
@@ -69,7 +69,7 @@ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentat
 	{
 	public:
 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-#if CRYPTOPP_ENABLE_ADVANCED_PROCESS_BLOCKS
+#if CRYPTOPP_RIJNDAEL_ADVANCED_PROCESS_BLOCKS
 		size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
 #endif
 	};
@@ -83,7 +83,7 @@ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentat
 	{
 	public:
 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-#if CRYPTOPP_ENABLE_ADVANCED_PROCESS_BLOCKS
+#if CRYPTOPP_RIJNDAEL_ADVANCED_PROCESS_BLOCKS
 		size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
 #endif
 	};