diff --git a/include/nwnss/library/xUnicode.h b/include/nwnss/library/xUnicode.h
index 0f78cf1..d43edd8 100644
--- a/include/nwnss/library/xUnicode.h
+++ b/include/nwnss/library/xUnicode.h
@@ -299,7 +299,7 @@ extern STATUS LB_UTF8LenToUniChar(
 #define NSS_UNI_CONVERSION_RAW				2  /* No wildCard handling, noMap -> [xxxx] */
 #define NSS_UNI_CONVERSION_WILD_DOS			3  /* Default NSS converter type with default wildcard handling, DOS FF handling */
 
-#if defined(_NSS_INTERNAL_) || defined(MARS_NWE_NWCORE_UNICODE)
+#if defined(_NSS_INTERNAL_) || defined(MARS_NWE_NWNSS_UNICODE)
 #	define NSS_UNI_CONVERSION_LAST_DEFINED	3  /* Highest Number of pre-defined types */
 #	define NSS_UNI_CONVERSION_COUNT			16 /* Max registerable converter types */
 
@@ -356,7 +356,7 @@ extern unicode_t *LB_unimcpy(
 //		CONST unicode_t *src1,
 //		CONST char *src2);
 
-#if zNETWARE || defined(__KERNEL__) || defined(MARS_NWE_NWCORE_UNICODE)
+#if zNETWARE || defined(__KERNEL__) || defined(MARS_NWE_NWNSS_UNICODE)
 /*-------------------------------------------------------------------------
  *	Case conversion Routines (not in standard library)
  *-------------------------------------------------------------------------*/
@@ -480,7 +480,7 @@ extern int LB_unincmp(				/* Unicode length compare  */
    const unicode_t *s2,
    size_t len);
 
-#if zNETWARE || defined(__KERNEL__) || defined(MARS_NWE_NWCORE_UNICODE)
+#if zNETWARE || defined(__KERNEL__) || defined(MARS_NWE_NWNSS_UNICODE)
 #undef uniicmp
 #define uniicmp(s1, s2) LB_uniicmp(s1, s2)
 extern int LB_uniicmp(
diff --git a/src/nwnss/CMakeLists.txt b/src/nwnss/CMakeLists.txt
index c8700dd..9e00c1f 100644
--- a/src/nwnss/CMakeLists.txt
+++ b/src/nwnss/CMakeLists.txt
@@ -117,7 +117,7 @@ target_compile_definitions(nwnss PRIVATE
     _GNU_SOURCE
     MARS_NWE_NWCORE_DOS_CODEPAGE="VENDORS/MICSFT/PC/CP850"
     MARS_NWE_NWCORE_MAC_CODEPAGE="VENDORS/APPLE/ROMAN"
-    MARS_NWE_NWCORE_UNICODE
+    MARS_NWE_NWNSS_UNICODE
     MARS_NWE_VERSION_STRING="${MARS_NWE_VERSION}")
 
 target_include_directories(nwnss