--- a/Makefile.in
+++ b/Makefile.in
@@ -42,17 +42,17 @@ tier_base_dirs += \
 endif
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 tier_base_dirs += \
   other-licenses/android \
   $(NULL)
 endif
 
 ifdef MOZ_MEMORY
-tier_base_dirs += memory/jemalloc
+tier_base_dirs += memory/mozjemalloc
 tier_base_dirs += memory/build
 endif
 tier_base_dirs += \
   mozglue \
   memory/mozalloc \
   $(NULL)
 endif
 

--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -56,17 +56,17 @@ if [ ! "$LIBXUL_SDK" ]; then
   fi
   add_makefiles "
     memory/mozalloc/Makefile
     mozglue/Makefile
     mozglue/build/Makefile
   "
   if [ "$MOZ_MEMORY" ]; then
     add_makefiles "
-      memory/jemalloc/Makefile
+      memory/mozjemalloc/Makefile
       memory/build/Makefile
     "
   fi
   if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
     add_makefiles "
       other-licenses/android/Makefile
       other-licenses/skia-npapi/Makefile
       mozglue/android/Makefile

--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -15,11 +15,11 @@ FORCE_STATIC_LIB = 1
 STLFLAGS =
 ifdef MOZ_GLUE_PROGRAM_LDFLAGS
 SDK_LIBRARY = $(REAL_LIBRARY)
 DIST_INSTALL = 1
 endif
 
 CSRCS = extraMallocFuncs.c
 
-SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
+SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
 
 include $(topsrcdir)/config/rules.mk

rename from memory/jemalloc/Makefile.in
rename to memory/mozjemalloc/Makefile.in

rename from memory/jemalloc/jemalloc.c
rename to memory/mozjemalloc/jemalloc.c

rename from memory/jemalloc/jemalloc.h
rename to memory/mozjemalloc/jemalloc.h

rename from memory/jemalloc/jemalloc_types.h
rename to memory/mozjemalloc/jemalloc_types.h

rename from memory/jemalloc/linkedlist.h
rename to memory/mozjemalloc/linkedlist.h

rename from memory/jemalloc/osx_zone_types.h
rename to memory/mozjemalloc/osx_zone_types.h

rename from memory/jemalloc/ql.h
rename to memory/mozjemalloc/ql.h

rename from memory/jemalloc/qr.h
rename to memory/mozjemalloc/qr.h

rename from memory/jemalloc/rb.h
rename to memory/mozjemalloc/rb.h

--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -1708,17 +1708,17 @@ 5. Disclaimer/Limitation of Liability: T
    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 </pre>
 
     <hr>
 
     <h1><a id="jemalloc"></a>jemalloc License</h1>
 
     <p>This license applies to files in the directory
-    <span class="path">memory/jemalloc/</span>.
+    <span class="path">memory/mozjemalloc/</span>.
     </p>
 
 <pre>
 Copyright (C) 2006-2008 Jason Evans &lt;jasone@FreeBSD.org&gt;.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions