diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 842d33e8713..f1ca3d9efac 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -1818,8 +1818,8 @@ NSEvent* gLastDragEvent = nil;
                                                           NSURLPboardType,
                                                           NSFilesPromisePboardType,
                                                           kWildcardPboardType,
-                                                          kCorePasteboardFlavorType_url,
-                                                          kCorePasteboardFlavorType_urln,
+                                                          kCorePboardType_url,
+                                                          kCorePboardType_urln,
                                                           nil]];
 
   return self;
diff --git a/widget/src/cocoa/nsClipboard.mm b/widget/src/cocoa/nsClipboard.mm
index 9ec71caa99a..8560309d8fa 100644
--- a/widget/src/cocoa/nsClipboard.mm
+++ b/widget/src/cocoa/nsClipboard.mm
@@ -491,7 +491,7 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
 
         NSString *nativeTitle = [[NSString alloc] initWithCharacters:urlTitle.get() length:urlTitle.Length()];
         // be nice to Carbon apps, normalize the receiver's contents using Form C.
-        [pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePasteboardFlavorType_urln];
+        [pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePboardType_urln];
         [nativeTitle release];
       }
 
@@ -505,7 +505,7 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
       // printf("Escaped url is %s, length %d\n", escData.get(), escData.Length());
 
       NSString *nativeURL = [NSString stringWithUTF8String:escData.get()];
-      [pasteboardOutputDict setObject:nativeURL forKey:kCorePasteboardFlavorType_url];
+      [pasteboardOutputDict setObject:nativeURL forKey:kCorePboardType_url];
     }
     // If it wasn't a type that we recognize as exportable we don't put it on the system
     // clipboard. We'll just access it from our cached transferable when we need it.
diff --git a/widget/src/cocoa/nsDragService.h b/widget/src/cocoa/nsDragService.h
index 5b3285ef7a8..ce94490a1b0 100644
--- a/widget/src/cocoa/nsDragService.h
+++ b/widget/src/cocoa/nsDragService.h
@@ -44,8 +44,8 @@
 #include <Cocoa/Cocoa.h>
 
 extern NSString* const kWildcardPboardType;
-extern NSString* const kCorePasteboardFlavorType_url;
-extern NSString* const kCorePasteboardFlavorType_urln;
+extern NSString* const kCorePboardType_url;
+extern NSString* const kCorePboardType_urln;
 
 class nsDragService : public nsBaseDragService
 {
diff --git a/widget/src/cocoa/nsDragService.mm b/widget/src/cocoa/nsDragService.mm
index 683148e1019..f24e68465c2 100644
--- a/widget/src/cocoa/nsDragService.mm
+++ b/widget/src/cocoa/nsDragService.mm
@@ -83,8 +83,8 @@ extern NSEvent* gLastDragEvent;
 nsISupportsArray *gDraggedTransferables = nsnull;
 
 NSString* const kWildcardPboardType = @"MozillaWildcard";
-NSString* const kCorePasteboardFlavorType_url  = @"CorePasteboardFlavorType 0x75726C20"; // 'url '  url
-NSString* const kCorePasteboardFlavorType_urln = @"CorePasteboardFlavorType 0x75726C6E"; // 'urln'  title
+NSString* const kCorePboardType_url  = @"CorePasteboardFlavorType 0x75726C20"; // 'url '  url
+NSString* const kCorePboardType_urln = @"CorePasteboardFlavorType 0x75726C6E"; // 'urln'  title
 
 nsDragService::nsDragService()
 {
@@ -134,8 +134,8 @@ static nsresult SetUpDragClipboard(nsISupportsArray* aTransferableArray)
       NSString* currentKey = [types objectAtIndex:i];
       id currentValue = [pasteboardOutputDict valueForKey:currentKey];
       if (currentKey == NSStringPboardType ||
-          currentKey == kCorePasteboardFlavorType_url ||
-          currentKey == kCorePasteboardFlavorType_urln) {
+          currentKey == kCorePboardType_url ||
+          currentKey == kCorePboardType_urln) {
         [dragPBoard setString:currentValue forType:currentKey];
       }
       else if (currentKey == NSTIFFPboardType) {