diff --git a/nsprpub/config/nsinstall.c b/nsprpub/config/nsinstall.c
index f128cef1aaaa..0f3cd3e2258b 100644
--- a/nsprpub/config/nsinstall.c
+++ b/nsprpub/config/nsinstall.c
@@ -67,7 +67,7 @@
  * Does getcwd() take NULL as the first argument and malloc
  * the result buffer?
  */
-#if !defined(RHAPSODY) && !defined(NEXTSTEP) && !defined(VMS)
+#if !defined(DARWIN) && !defined(NEXTSTEP) && !defined(VMS)
 #define GETCWD_CAN_MALLOC
 #endif
 
diff --git a/nsprpub/configure b/nsprpub/configure
index 3c2ef17db5db..fbd388286521 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -4109,14 +4109,14 @@ EOF
 EOF
 
     cat >> confdefs.h <<\EOF
-#define RHAPSODY 1
+#define DARWIN 1
 EOF
 
     cat >> confdefs.h <<\EOF
 #define HAVE_BSD_FLOCK 1
 EOF
 
-    CFLAGS="$CFLAGS -Wmost -fno-common -pipe"    
+    CFLAGS="$CFLAGS -Wmost -fno-common -pipe"
     if echo $OS_TEST | grep -c 86 2>/dev/null; then
         CFLAGS="$CFLAGS -mno-486"
         cat >> confdefs.h <<\EOF
@@ -4135,8 +4135,8 @@ EOF
     MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
     DLL_SUFFIX=dylib
     USE_PTHREADS=1
-    MDCPUCFG_H=_rhapsody.cfg
-    PR_MD_CSRCS=rhapsody.c
+    MDCPUCFG_H=_darwin.cfg
+    PR_MD_CSRCS=darwin.c
     ;;
 
 *-*-sco*)
@@ -5482,7 +5482,7 @@ s%\[%\\&%g
 s%\]%\\&%g
 s%\$%$$%g
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '`
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '| tr '\015' ' '`
 rm -f conftest.defs
 
 
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 4484a89903de..7fb51340acf7 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1419,9 +1419,9 @@ mips-sony-newsos*)
 
 *-darwin*)
     AC_DEFINE(XP_UNIX)
-    AC_DEFINE(RHAPSODY)
+    AC_DEFINE(DARWIN)
     AC_DEFINE(HAVE_BSD_FLOCK)
-    CFLAGS="$CFLAGS -Wmost -fno-common -pipe"    
+    CFLAGS="$CFLAGS -Wmost -fno-common -pipe"
     if echo $OS_TEST | grep -c 86 2>/dev/null; then
         CFLAGS="$CFLAGS -mno-486"
         AC_DEFINE(i386)
@@ -1434,8 +1434,8 @@ mips-sony-newsos*)
     MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
     DLL_SUFFIX=dylib
     USE_PTHREADS=1
-    MDCPUCFG_H=_rhapsody.cfg
-    PR_MD_CSRCS=rhapsody.c
+    MDCPUCFG_H=_darwin.cfg
+    PR_MD_CSRCS=darwin.c
     ;;
 
 *-*-sco*)
diff --git a/nsprpub/pr/include/gencfg.c b/nsprpub/pr/include/gencfg.c
index b49f548c6570..87bf4912a214 100644
--- a/nsprpub/pr/include/gencfg.c
+++ b/nsprpub/pr/include/gencfg.c
@@ -94,8 +94,8 @@
 #endif
 
 #if defined(__APPLE__)
-#ifndef RHAPSODY
-      error - RHAPSODY is not defined
+#ifndef DARWIN
+      error - DARWIN is not defined
 #endif
 #endif
 
diff --git a/nsprpub/pr/include/md/_pth.h b/nsprpub/pr/include/md/_pth.h
index be65ab749fff..21815728f3e9 100644
--- a/nsprpub/pr/include/md/_pth.h
+++ b/nsprpub/pr/include/md/_pth.h
@@ -134,7 +134,7 @@
 #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
 	|| defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
 	|| defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-	|| defined(VMS) || defined(NTO) || defined(RHAPSODY)
+	|| defined(VMS) || defined(NTO) || defined(DARWIN)
 #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t)  (t) = 0
 #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t)  (t) == 0
 #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
@@ -245,7 +245,7 @@
 #define PT_PRIO_MIN            1
 #define PT_PRIO_MAX            127
 #elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+	|| defined(BSDI) || defined(DARWIN) /* XXX */
 #define PT_PRIO_MIN            0
 #define PT_PRIO_MAX            126
 #else
@@ -278,7 +278,7 @@ extern int (*_PT_aix_yield_fcn)();
     PR_END_MACRO
 #elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
 	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-	|| defined(BSDI) || defined(NTO) || defined(RHAPSODY)
+	|| defined(BSDI) || defined(NTO) || defined(DARWIN)
 #define _PT_PTHREAD_YIELD()            	sched_yield()
 #else
 #error "Need to define _PT_PTHREAD_YIELD for this platform"
diff --git a/nsprpub/pr/include/md/_unixos.h b/nsprpub/pr/include/md/_unixos.h
index 676b3ab20223..345c48d5ee35 100644
--- a/nsprpub/pr/include/md/_unixos.h
+++ b/nsprpub/pr/include/md/_unixos.h
@@ -43,7 +43,7 @@
  * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
  * not be redefined.
  */
-#if !defined(LINUX) && !defined(RHAPSODY) && !defined(NEXTSTEP)
+#if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP)
 #ifndef FD_SETSIZE
 #define FD_SETSIZE  4096
 #endif
@@ -165,7 +165,7 @@ extern void _MD_unix_init_running_cpu(struct _PRCPU *cpu);
 #define PROT_NONE 0x0
 #endif
 
-#if defined(DEBUG) && !defined(RHAPSODY) && !defined(NEXTSTEP)
+#if defined(DEBUG) && !defined(DARWIN) && !defined(NEXTSTEP)
 #if !defined(SOLARIS)	
 #include <string.h>  /* for memset() */
 #define _MD_INIT_STACK(ts,REDZONE)					\
diff --git a/nsprpub/pr/include/md/prosdep.h b/nsprpub/pr/include/md/prosdep.h
index 9ca8cf6846f6..7016cbb7456d 100644
--- a/nsprpub/pr/include/md/prosdep.h
+++ b/nsprpub/pr/include/md/prosdep.h
@@ -93,8 +93,8 @@ PR_BEGIN_EXTERN_C
 #elif defined(OSF1)
 #include "md/_osf1.h"
 
-#elif defined(RHAPSODY)
-#include "md/_rhapsody.h"
+#elif defined(DARWIN)
+#include "md/_darwin.h"
 
 #elif defined(NEXTSTEP)
 #include "md/_nextstep.h"
diff --git a/nsprpub/pr/include/private/primpl.h b/nsprpub/pr/include/private/primpl.h
index 2756745467f8..30ddf5c56073 100644
--- a/nsprpub/pr/include/private/primpl.h
+++ b/nsprpub/pr/include/private/primpl.h
@@ -1796,7 +1796,7 @@ extern PRFileDesc *_pr_stderr;
 #if !defined(_PR_NO_PREEMPT) && defined(XP_UNIX) \
         && !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY) \
         && !defined(PURIFY) \
-        && !defined(RHAPSODY) \
+        && !defined(DARWIN) \
         && !defined(NEXTSTEP) \
         && !defined(QNX) \
         && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
diff --git a/nsprpub/pr/src/linking/prlink.c b/nsprpub/pr/src/linking/prlink.c
index ca55a9fb66fe..b3802055ea4b 100644
--- a/nsprpub/pr/src/linking/prlink.c
+++ b/nsprpub/pr/src/linking/prlink.c
@@ -85,7 +85,7 @@
 /*
  * On these platforms, symbols have a leading '_'.
  */
-#if defined(SUNOS4) || defined(RHAPSODY) || defined(NEXTSTEP) \
+#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
     || defined(OPENBSD) || defined(WIN16) \
     || (defined(NETBSD) && !defined(__ELF__))
 #define NEED_LEADING_UNDERSCORE
diff --git a/nsprpub/pr/src/md/beos/beos_errors.c b/nsprpub/pr/src/md/beos/beos_errors.c
index 3af7179a0a76..6532cc8e9a40 100644
--- a/nsprpub/pr/src/md/beos/beos_errors.c
+++ b/nsprpub/pr/src/md/beos/beos_errors.c
@@ -176,12 +176,6 @@ void _MD_unix_map_unlink_error(int err)
 		case EROFS:
 			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
 			break;
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#endif
 		default:
 			PR_SetError(PR_UNKNOWN_ERROR, err);
 			break;
@@ -201,10 +195,6 @@ void _MD_unix_map_stat_error(int err)
 			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
 			break;
 		case ETIMEDOUT:
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-#endif
 			PR_SetError(PR_REMOTE_FILE_ERROR, err);
 			break;
 		case ELOOP:
@@ -294,12 +284,6 @@ void _MD_unix_map_rename_error(int err)
 		case ELOOP:
 			PR_SetError(PR_LOOP_ERROR, err);
 			break;
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#endif
 		case ENAMETOOLONG:
 			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
 			break;
@@ -345,10 +329,6 @@ void _MD_unix_map_access_error(int err)
 		case ELOOP:
 			PR_SetError(PR_LOOP_ERROR, err);
 			break;
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-#endif
 		case ETIMEDOUT:
 			PR_SetError(PR_REMOTE_FILE_ERROR, err);
 			break;
@@ -411,12 +391,6 @@ void _MD_unix_map_mkdir_error(int err)
 		case EIO:
 			PR_SetError(PR_IO_ERROR, err);
 			break;
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#endif
 		default:
 			PR_SetError(PR_UNKNOWN_ERROR, err);
 			break;
@@ -448,10 +422,6 @@ void _MD_unix_map_rmdir_error(int err)
 		case ELOOP:
 			PR_SetError(PR_LOOP_ERROR, err);
 			break;
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-#endif
 		case ETIMEDOUT:
 			PR_SetError(PR_REMOTE_FILE_ERROR, err);
 			break;
@@ -1397,10 +1367,6 @@ void _MD_unix_map_open_error(int err)
 			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
 			break;
 		case ETIMEDOUT:
-#if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(BEOS)
-		case EMULTIHOP:
-		case ENOLINK:
-#endif
 			PR_SetError(PR_REMOTE_FILE_ERROR, err);
 			break;
 		case EROFS:
diff --git a/nsprpub/pr/src/md/prosdep.c b/nsprpub/pr/src/md/prosdep.c
index 8d81407c4d5d..66dec1943e23 100644
--- a/nsprpub/pr/src/md/prosdep.c
+++ b/nsprpub/pr/src/md/prosdep.c
@@ -62,7 +62,7 @@ static void GetPageSize(void)
 #ifdef XP_UNIX
 #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
         || defined FREEBSD || defined NETBSD || defined OPENBSD \
-        || defined RHAPSODY || defined NEXTSTEP
+        || defined DARWIN || defined NEXTSTEP
     _pr_pageSize = getpagesize();
 #elif defined(HPUX)
     /* I have no idea. Don't get me started. --Rob */
diff --git a/nsprpub/pr/src/md/unix/unix.c b/nsprpub/pr/src/md/unix/unix.c
index 6352bcf8393b..69153f27d72e 100644
--- a/nsprpub/pr/src/md/unix/unix.c
+++ b/nsprpub/pr/src/md/unix/unix.c
@@ -69,7 +69,7 @@
 #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
     || defined(BSDI) || defined(SCO) || defined(NEC) || defined(SNI) \
-    || defined(SUNOS4) || defined(NCR) || defined(RHAPSODY) \
+    || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
     || defined(NEXTSTEP) || defined(QNX)
 #define _PRSockLen_t int
 #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
diff --git a/nsprpub/pr/src/md/unix/uxproces.c b/nsprpub/pr/src/md/unix/uxproces.c
index 9530cf5234e9..58b5ab8ac719 100644
--- a/nsprpub/pr/src/md/unix/uxproces.c
+++ b/nsprpub/pr/src/md/unix/uxproces.c
@@ -43,7 +43,7 @@
 #include <dlfcn.h>  /* For dlopen, dlsym, dlclose */
 #endif
 
-#if defined(RHAPSODY)
+#if defined(DARWIN)
 #include <crt_externs.h>
 #else
 extern char **environ;
@@ -183,7 +183,7 @@ ForkAndExec(
     childEnvp = envp;
     if (attr && attr->fdInheritBuffer) {
         if (NULL == childEnvp) {
-#ifdef RHAPSODY
+#ifdef DARWIN
             childEnvp = *(_NSGetEnviron());
 #else
             childEnvp = environ;
diff --git a/nsprpub/pr/src/md/unix/uxrng.c b/nsprpub/pr/src/md/unix/uxrng.c
index 135018fbab56..6435828944ae 100644
--- a/nsprpub/pr/src/md/unix/uxrng.c
+++ b/nsprpub/pr/src/md/unix/uxrng.c
@@ -278,7 +278,7 @@ GetHighResClock(void *buf, size_t maxbytes)
     return 0;
 }
 #elif defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(NTO) \
-    || defined(QNX) || defined(RHAPSODY)
+    || defined(QNX) || defined(DARWIN)
 #include <sys/times.h>
 
 static size_t
diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c
index a624ea3479af..bb786766d719 100644
--- a/nsprpub/pr/src/misc/prsystem.c
+++ b/nsprpub/pr/src/misc/prsystem.c
@@ -51,7 +51,7 @@
 
 /* BSD-derived systems use sysctl() to get the number of processors */
 #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
-    || defined(OPENBSD) || defined(RHAPSODY)
+    || defined(OPENBSD) || defined(DARWIN)
 #define _PR_HAVE_SYSCTL
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/nsprpub/pr/src/pthreads/ptio.c b/nsprpub/pr/src/pthreads/ptio.c
index 6a2e9903fee5..073fcd2d1acb 100644
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -184,7 +184,7 @@ static ssize_t (*pt_aix_sendfile_fptr)() = NULL;
 #define _PRSockOptVal_t char *
 #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
     || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
-    || defined(NTO) || defined(OPENBSD) || defined(RHAPSODY)
+    || defined(NTO) || defined(OPENBSD) || defined(DARWIN)
 #define _PRSockOptVal_t void *
 #else
 #error "Cannot determine architecture"
@@ -198,7 +198,7 @@ static ssize_t (*pt_aix_sendfile_fptr)() = NULL;
     || defined(OSF1) || defined(SOLARIS) \
     || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \
     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-    || defined(BSDI) || defined(VMS) || defined(NTO) || defined(RHAPSODY)
+    || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN)
 #define _PRSelectFdSetArg_t fd_set *
 #else
 #error "Cannot determine architecture"
@@ -2994,7 +2994,7 @@ static PRIOMethods _pr_socketpollfd_methods = {
 #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
     || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \
     || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
-    || defined(RHAPSODY)
+    || defined(DARWIN)
 #define _PR_FCNTL_FLAGS O_NONBLOCK
 #else
 #error "Can't determine architecture"
diff --git a/nsprpub/pr/tests/Makefile.in b/nsprpub/pr/tests/Makefile.in
index c1931a473275..fdbcfd28d45e 100644
--- a/nsprpub/pr/tests/Makefile.in
+++ b/nsprpub/pr/tests/Makefile.in
@@ -424,7 +424,7 @@ LIBPTHREAD = -lpthread
 ifeq ($(OS_ARCH),AIX)
 LIBPTHREAD = -lpthreads
 endif
-ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO Rhapsody,$(OS_ARCH)))
+ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO Darwin,$(OS_ARCH)))
 LIBPTHREAD =
 endif
 ifeq ($(OS_ARCH)$(basename $(OS_RELEASE)),HP-UXB.10)
diff --git a/nsprpub/pr/tests/dll/Makefile.in b/nsprpub/pr/tests/dll/Makefile.in
index 37e2f0060193..cd0cca6e9326 100644
--- a/nsprpub/pr/tests/dll/Makefile.in
+++ b/nsprpub/pr/tests/dll/Makefile.in
@@ -91,7 +91,7 @@ endif
 # To create a loadable module on Rhapsody, we must override
 # -dynamiclib with -bundle.
 #
-ifeq ($(OS_ARCH),Rhapsody)
+ifeq ($(OS_ARCH),Darwin)
 DSO_LDOPTS = -bundle
 endif