diff --git a/ChangeLog b/ChangeLog
index 8e189d12d..f64ba63bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 21 16:50:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/include/NSThread.h: Update notification names to MacOS-X
+	with defines for OpenStep compatibility.
+	* Source/NSThread.m: Update notification names to MacOS-X
+	* Source/externs.m: Update thread notification names to MacOS-X
+
 Fri May 21 16:40:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/include/NSZone.h: Added NSZoneMallocAtomic() for Helge
diff --git a/Headers/gnustep/base/NSThread.h b/Headers/gnustep/base/NSThread.h
index 7d4bb80a9..d51ea0dc1 100644
--- a/Headers/gnustep/base/NSThread.h
+++ b/Headers/gnustep/base/NSThread.h
@@ -63,8 +63,10 @@ typedef enum
 @end
 
 /* Notification Strings. */
-extern NSString *NSBecomingMultiThreaded;
-extern NSString *NSThreadExiting;
+extern NSString	*NSWillBecomeMultiThreadedNotification;
+#define	NSBecomingMultiThreaded NSWillBecomeMultiThreadedNotification
+extern NSString	*NSThreadWillExitNotification;
+#define NSThreadExiting NSThreadWillExitNotification
 
 #ifndef	NO_GNUSTEP
 /*
diff --git a/Source/NSThread.m b/Source/NSThread.m
index 0ce6afab2..87ca48213 100644
--- a/Source/NSThread.m
+++ b/Source/NSThread.m
@@ -78,7 +78,7 @@ void gnustep_base_thread_callback()
     {
       entered_multi_threaded_state = YES;
       [[NSNotificationCenter defaultCenter]
-	postNotificationName: NSBecomingMultiThreaded
+	postNotificationName: NSWillBecomeMultiThreadedNotification
 	object: nil];
     }
 }
@@ -215,7 +215,7 @@ void gnustep_base_thread_callback()
 
   // Post the notification
   [[NSNotificationCenter defaultCenter]
-    postNotificationName: NSThreadExiting
+    postNotificationName: NSThreadWillExitNotification
     object: t];
 
   /*
diff --git a/Source/externs.m b/Source/externs.m
index b8bbde627..f76ff7e63 100644
--- a/Source/externs.m
+++ b/Source/externs.m
@@ -44,8 +44,10 @@ NSString *ConnectionWasCreatedNotification =
 @"ConnectionWasCreatedNotification";
 
 /* NSThread Notifications */
-NSString *NSBecomingMultiThreaded = @"NSBecomingMultiThreadedNotification";
-NSString *NSThreadExiting = @"NSThreadExitingNotification";
+NSString *NSWillBecomeMultiThreadedNotification
+  = @"NSWillBecomeMultiThreadedNotification";
+NSString *NSThreadWillExitNotification
+  = @"NSThreadWillExitNotification";
 
 /* Port Notifications */
 NSString *PortBecameInvalidNotification = @"PortBecameInvalidNotification";