diff --git a/mozilla/camino/Chimera.pbproj/project.pbxproj b/mozilla/camino/Chimera.pbproj/project.pbxproj
index 8081e4890b9..5d83750aa8e 100644
--- a/mozilla/camino/Chimera.pbproj/project.pbxproj
+++ b/mozilla/camino/Chimera.pbproj/project.pbxproj
@@ -2460,7 +2460,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Privacy.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PrivacyPrefPane</string>
+	<string>org.mozilla.chimera.preference.privacy</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2476,7 +2476,7 @@
 	<key>NSMainNibFile</key>
 	<string>Privacy</string>
 	<key>NSPrincipalClass</key>
-	<string>PrivacyPane</string>
+	<string>OrgMozillaChimeraPreferencePrivacy</string>
 </dict>
 </plist>
 ";
@@ -2821,7 +2821,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Personal.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PersonalPrefPane</string>
+	<string>org.mozilla.chimera.preference.personal</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2839,7 +2839,7 @@
 	<key>NSPrefPaneIconFIle</key>
 	<string>Personal.tiff</string>
 	<key>NSPrincipalClass</key>
-	<string>PersonalPane</string>
+	<string>OrgMozillaChimeraPreferencePersonal</string>
 </dict>
 </plist>
 ";
diff --git a/mozilla/camino/PreferencePanes/MVPreferencePaneDefaults.plist b/mozilla/camino/PreferencePanes/MVPreferencePaneDefaults.plist
index e1574407fcb..cea908732dc 100644
--- a/mozilla/camino/PreferencePanes/MVPreferencePaneDefaults.plist
+++ b/mozilla/camino/PreferencePanes/MVPreferencePaneDefaults.plist
@@ -1,7 +1,7 @@
 ( Chimera.SitesPrefPane,
   Chimera.BrowsingPrefPane,
-  Chimera.PersonalPrefPane, 
+  org.mozilla.chimera.preference.personal, 
   Chimera.HelpersPrefPane,
-  Chimera.PrivacyPrefPane,
+  org.mozilla.chimera.preference.privacy,
   Chimera.SecurityPrefPane
 )
diff --git a/mozilla/camino/PreferencePanes/MVPreferencePaneGroups.plist b/mozilla/camino/PreferencePanes/MVPreferencePaneGroups.plist
index ad5199ee34b..c03547e672e 100644
--- a/mozilla/camino/PreferencePanes/MVPreferencePaneGroups.plist
+++ b/mozilla/camino/PreferencePanes/MVPreferencePaneGroups.plist
@@ -2,11 +2,11 @@
 	{
 		identifier = chimera; 
 		panes = (
-			Chimera.SitesPrefPane,
+            Chimera.SitesPrefPane,
             Chimera.BrowsingPrefPane,
-            Chimera.PersonalPrefPane, 
+            org.mozilla.chimera.preference.personal, 
             Chimera.HelpersPrefPane,
-            Chimera.PrivacyPrefPane,
+            org.mozilla.chimera.preference.privacy,
             Chimera.SecurityPrefPane,
             Chimera.AdvancedPrefPane
 		); 
diff --git a/mozilla/camino/PreferencePanes/Personal/PersonalPane.h b/mozilla/camino/PreferencePanes/Personal/PersonalPane.h
index e1d126e9c27..942ecdc2b98 100644
--- a/mozilla/camino/PreferencePanes/Personal/PersonalPane.h
+++ b/mozilla/camino/PreferencePanes/Personal/PersonalPane.h
@@ -1,7 +1,7 @@
 #import <Cocoa/Cocoa.h>
 #import <PreferencePanes/NSPreferencePane.h>
 
-@interface PersonalPane : NSPreferencePane
+@interface OrgMozillaChimeraPreferencePersonal : NSPreferencePane
 {
 
 }
diff --git a/mozilla/camino/PreferencePanes/Personal/PersonalPane.m b/mozilla/camino/PreferencePanes/Personal/PersonalPane.m
index 7e7ddf507a8..b9a28fe3efe 100644
--- a/mozilla/camino/PreferencePanes/Personal/PersonalPane.m
+++ b/mozilla/camino/PreferencePanes/Personal/PersonalPane.m
@@ -1,6 +1,6 @@
 #import "PersonalPane.h"
 
-@implementation PersonalPane
+@implementation OrgMozillaChimeraPreferencePersonal
 
 
 - (id) initWithBundle:(NSBundle *) bundle {
diff --git a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h
index 81f864f46e2..d10ab3c333a 100644
--- a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h
+++ b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h
@@ -1,7 +1,7 @@
 #import <Cocoa/Cocoa.h>
 #import <PreferencePanes/NSPreferencePane.h>
 
-@interface PrivacyPane : NSPreferencePane
+@interface OrgMozillaChimeraPreferencePrivacy : NSPreferencePane
 {
   IBOutlet id mCookies;
   IBOutlet NSButton* mPromptForCookie;
diff --git a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm
index 053fd39264c..50ed3ca6607 100644
--- a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm
+++ b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm
@@ -6,7 +6,7 @@
 #include "nsCCookieManager.h"
 #include "nsICacheService.h"
 
-@implementation PrivacyPane
+@implementation OrgMozillaChimeraPreferencePrivacy
 
 - (void) dealloc
 {
diff --git a/mozilla/camino/projects/Chimera.pbproj/project.pbxproj b/mozilla/camino/projects/Chimera.pbproj/project.pbxproj
index 8081e4890b9..5d83750aa8e 100644
--- a/mozilla/camino/projects/Chimera.pbproj/project.pbxproj
+++ b/mozilla/camino/projects/Chimera.pbproj/project.pbxproj
@@ -2460,7 +2460,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Privacy.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PrivacyPrefPane</string>
+	<string>org.mozilla.chimera.preference.privacy</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2476,7 +2476,7 @@
 	<key>NSMainNibFile</key>
 	<string>Privacy</string>
 	<key>NSPrincipalClass</key>
-	<string>PrivacyPane</string>
+	<string>OrgMozillaChimeraPreferencePrivacy</string>
 </dict>
 </plist>
 ";
@@ -2821,7 +2821,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Personal.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PersonalPrefPane</string>
+	<string>org.mozilla.chimera.preference.personal</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2839,7 +2839,7 @@
 	<key>NSPrefPaneIconFIle</key>
 	<string>Personal.tiff</string>
 	<key>NSPrincipalClass</key>
-	<string>PersonalPane</string>
+	<string>OrgMozillaChimeraPreferencePersonal</string>
 </dict>
 </plist>
 ";
diff --git a/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist b/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist
index e1574407fcb..cea908732dc 100644
--- a/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist
+++ b/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist
@@ -1,7 +1,7 @@
 ( Chimera.SitesPrefPane,
   Chimera.BrowsingPrefPane,
-  Chimera.PersonalPrefPane, 
+  org.mozilla.chimera.preference.personal, 
   Chimera.HelpersPrefPane,
-  Chimera.PrivacyPrefPane,
+  org.mozilla.chimera.preference.privacy,
   Chimera.SecurityPrefPane
 )
diff --git a/mozilla/camino/src/preferences/MVPreferencePaneGroups.plist b/mozilla/camino/src/preferences/MVPreferencePaneGroups.plist
index ad5199ee34b..c03547e672e 100644
--- a/mozilla/camino/src/preferences/MVPreferencePaneGroups.plist
+++ b/mozilla/camino/src/preferences/MVPreferencePaneGroups.plist
@@ -2,11 +2,11 @@
 	{
 		identifier = chimera; 
 		panes = (
-			Chimera.SitesPrefPane,
+            Chimera.SitesPrefPane,
             Chimera.BrowsingPrefPane,
-            Chimera.PersonalPrefPane, 
+            org.mozilla.chimera.preference.personal, 
             Chimera.HelpersPrefPane,
-            Chimera.PrivacyPrefPane,
+            org.mozilla.chimera.preference.privacy,
             Chimera.SecurityPrefPane,
             Chimera.AdvancedPrefPane
 		); 
diff --git a/mozilla/chimera/Chimera.pbproj/project.pbxproj b/mozilla/chimera/Chimera.pbproj/project.pbxproj
index 8081e4890b9..5d83750aa8e 100644
--- a/mozilla/chimera/Chimera.pbproj/project.pbxproj
+++ b/mozilla/chimera/Chimera.pbproj/project.pbxproj
@@ -2460,7 +2460,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Privacy.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PrivacyPrefPane</string>
+	<string>org.mozilla.chimera.preference.privacy</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2476,7 +2476,7 @@
 	<key>NSMainNibFile</key>
 	<string>Privacy</string>
 	<key>NSPrincipalClass</key>
-	<string>PrivacyPane</string>
+	<string>OrgMozillaChimeraPreferencePrivacy</string>
 </dict>
 </plist>
 ";
@@ -2821,7 +2821,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Personal.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PersonalPrefPane</string>
+	<string>org.mozilla.chimera.preference.personal</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2839,7 +2839,7 @@
 	<key>NSPrefPaneIconFIle</key>
 	<string>Personal.tiff</string>
 	<key>NSPrincipalClass</key>
-	<string>PersonalPane</string>
+	<string>OrgMozillaChimeraPreferencePersonal</string>
 </dict>
 </plist>
 ";
diff --git a/mozilla/chimera/PreferencePanes/MVPreferencePaneDefaults.plist b/mozilla/chimera/PreferencePanes/MVPreferencePaneDefaults.plist
index e1574407fcb..cea908732dc 100644
--- a/mozilla/chimera/PreferencePanes/MVPreferencePaneDefaults.plist
+++ b/mozilla/chimera/PreferencePanes/MVPreferencePaneDefaults.plist
@@ -1,7 +1,7 @@
 ( Chimera.SitesPrefPane,
   Chimera.BrowsingPrefPane,
-  Chimera.PersonalPrefPane, 
+  org.mozilla.chimera.preference.personal, 
   Chimera.HelpersPrefPane,
-  Chimera.PrivacyPrefPane,
+  org.mozilla.chimera.preference.privacy,
   Chimera.SecurityPrefPane
 )
diff --git a/mozilla/chimera/PreferencePanes/MVPreferencePaneGroups.plist b/mozilla/chimera/PreferencePanes/MVPreferencePaneGroups.plist
index ad5199ee34b..c03547e672e 100644
--- a/mozilla/chimera/PreferencePanes/MVPreferencePaneGroups.plist
+++ b/mozilla/chimera/PreferencePanes/MVPreferencePaneGroups.plist
@@ -2,11 +2,11 @@
 	{
 		identifier = chimera; 
 		panes = (
-			Chimera.SitesPrefPane,
+            Chimera.SitesPrefPane,
             Chimera.BrowsingPrefPane,
-            Chimera.PersonalPrefPane, 
+            org.mozilla.chimera.preference.personal, 
             Chimera.HelpersPrefPane,
-            Chimera.PrivacyPrefPane,
+            org.mozilla.chimera.preference.privacy,
             Chimera.SecurityPrefPane,
             Chimera.AdvancedPrefPane
 		); 
diff --git a/mozilla/chimera/PreferencePanes/Personal/PersonalPane.h b/mozilla/chimera/PreferencePanes/Personal/PersonalPane.h
index e1d126e9c27..942ecdc2b98 100644
--- a/mozilla/chimera/PreferencePanes/Personal/PersonalPane.h
+++ b/mozilla/chimera/PreferencePanes/Personal/PersonalPane.h
@@ -1,7 +1,7 @@
 #import <Cocoa/Cocoa.h>
 #import <PreferencePanes/NSPreferencePane.h>
 
-@interface PersonalPane : NSPreferencePane
+@interface OrgMozillaChimeraPreferencePersonal : NSPreferencePane
 {
 
 }
diff --git a/mozilla/chimera/PreferencePanes/Personal/PersonalPane.m b/mozilla/chimera/PreferencePanes/Personal/PersonalPane.m
index 7e7ddf507a8..b9a28fe3efe 100644
--- a/mozilla/chimera/PreferencePanes/Personal/PersonalPane.m
+++ b/mozilla/chimera/PreferencePanes/Personal/PersonalPane.m
@@ -1,6 +1,6 @@
 #import "PersonalPane.h"
 
-@implementation PersonalPane
+@implementation OrgMozillaChimeraPreferencePersonal
 
 
 - (id) initWithBundle:(NSBundle *) bundle {
diff --git a/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.h b/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.h
index 81f864f46e2..d10ab3c333a 100644
--- a/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.h
+++ b/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.h
@@ -1,7 +1,7 @@
 #import <Cocoa/Cocoa.h>
 #import <PreferencePanes/NSPreferencePane.h>
 
-@interface PrivacyPane : NSPreferencePane
+@interface OrgMozillaChimeraPreferencePrivacy : NSPreferencePane
 {
   IBOutlet id mCookies;
   IBOutlet NSButton* mPromptForCookie;
diff --git a/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm b/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm
index 053fd39264c..50ed3ca6607 100644
--- a/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm
+++ b/mozilla/chimera/PreferencePanes/Privacy/PrivacyPane.mm
@@ -6,7 +6,7 @@
 #include "nsCCookieManager.h"
 #include "nsICacheService.h"
 
-@implementation PrivacyPane
+@implementation OrgMozillaChimeraPreferencePrivacy
 
 - (void) dealloc
 {
diff --git a/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj b/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj
index 8081e4890b9..5d83750aa8e 100644
--- a/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj
+++ b/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj
@@ -2460,7 +2460,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Privacy.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PrivacyPrefPane</string>
+	<string>org.mozilla.chimera.preference.privacy</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2476,7 +2476,7 @@
 	<key>NSMainNibFile</key>
 	<string>Privacy</string>
 	<key>NSPrincipalClass</key>
-	<string>PrivacyPane</string>
+	<string>OrgMozillaChimeraPreferencePrivacy</string>
 </dict>
 </plist>
 ";
@@ -2821,7 +2821,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Personal.tiff</string>
 	<key>CFBundleIdentifier</key>
-	<string>Chimera.PersonalPrefPane</string>
+	<string>org.mozilla.chimera.preference.personal</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -2839,7 +2839,7 @@
 	<key>NSPrefPaneIconFIle</key>
 	<string>Personal.tiff</string>
 	<key>NSPrincipalClass</key>
-	<string>PersonalPane</string>
+	<string>OrgMozillaChimeraPreferencePersonal</string>
 </dict>
 </plist>
 ";
diff --git a/mozilla/chimera/src/preferences/MVPreferencePaneDefaults.plist b/mozilla/chimera/src/preferences/MVPreferencePaneDefaults.plist
index e1574407fcb..cea908732dc 100644
--- a/mozilla/chimera/src/preferences/MVPreferencePaneDefaults.plist
+++ b/mozilla/chimera/src/preferences/MVPreferencePaneDefaults.plist
@@ -1,7 +1,7 @@
 ( Chimera.SitesPrefPane,
   Chimera.BrowsingPrefPane,
-  Chimera.PersonalPrefPane, 
+  org.mozilla.chimera.preference.personal, 
   Chimera.HelpersPrefPane,
-  Chimera.PrivacyPrefPane,
+  org.mozilla.chimera.preference.privacy,
   Chimera.SecurityPrefPane
 )
diff --git a/mozilla/chimera/src/preferences/MVPreferencePaneGroups.plist b/mozilla/chimera/src/preferences/MVPreferencePaneGroups.plist
index ad5199ee34b..c03547e672e 100644
--- a/mozilla/chimera/src/preferences/MVPreferencePaneGroups.plist
+++ b/mozilla/chimera/src/preferences/MVPreferencePaneGroups.plist
@@ -2,11 +2,11 @@
 	{
 		identifier = chimera; 
 		panes = (
-			Chimera.SitesPrefPane,
+            Chimera.SitesPrefPane,
             Chimera.BrowsingPrefPane,
-            Chimera.PersonalPrefPane, 
+            org.mozilla.chimera.preference.personal, 
             Chimera.HelpersPrefPane,
-            Chimera.PrivacyPrefPane,
+            org.mozilla.chimera.preference.privacy,
             Chimera.SecurityPrefPane,
             Chimera.AdvancedPrefPane
 		);