diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c
index 8fe9653c..eb057c26 100644
--- a/tools/quake3/q3map2/bspfile_abstract.c
+++ b/tools/quake3/q3map2/bspfile_abstract.c
@@ -574,7 +574,7 @@ bool ParseEntity( void ){
 		if ( !GetToken( true ) ) {
 			Error( "ParseEntity: EOF without closing brace" );
 		}
-		if ( !EPAIR_STRCMP( token, "}" ) ) {
+		if ( strEqual( token, "}" ) ) {
 			break;
 		}
 		e = ParseEPair();
@@ -757,7 +757,7 @@ void SetKeyValue( entity_t *ent, const char *key, const char *value ){
 	/* check for existing epair */
 	for ( ep = ent->epairs; ep != NULL; ep = ep->next )
 	{
-		if ( !EPAIR_STRCMP( ep->key, key ) ) {
+		if ( EPAIR_EQUAL( ep->key, key ) ) {
 			free( ep->value );
 			ep->value = copystring( value );
 			return;
@@ -783,7 +783,7 @@ bool KeyExists( const entity_t *ent, const char *key ){
 	/* walk epair list */
 	for ( ep = ent->epairs; ep != NULL; ep = ep->next )
 	{
-		if ( !EPAIR_STRCMP( ep->key, key ) ) {
+		if ( EPAIR_EQUAL( ep->key, key ) ) {
 			return true;
 		}
 	}
@@ -809,7 +809,7 @@ const char *ValueForKey( const entity_t *ent, const char *key ){
 	/* walk epair list */
 	for ( ep = ent->epairs; ep != NULL; ep = ep->next )
 	{
-		if ( !EPAIR_STRCMP( ep->key, key ) ) {
+		if ( EPAIR_EQUAL( ep->key, key ) ) {
 			return ep->value;
 		}
 	}
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index d2f55121..bb9e54ea 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -144,9 +144,9 @@
 #define CASE_INSENSITIVE_EPAIRS 1
 
 #if CASE_INSENSITIVE_EPAIRS
-	#define EPAIR_STRCMP        Q_stricmp
+	#define EPAIR_EQUAL        striEqual
 #else
-	#define EPAIR_STRCMP        strcmp
+	#define EPAIR_EQUAL        strEqual
 #endif