--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -31,17 +31,17 @@ export('USE_EXTENSION_MANIFEST')
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['THEME'] = 'windows'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'linux'
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'content/lightning.js',
 ]
 
 FINAL_TARGET_FILES.timezones += [
     '../timezones/zones.json',
 ]
 
 with Files('**'):

--- a/chat/moz.build
+++ b/chat/moz.build
@@ -18,12 +18,12 @@ DIRS += [
     'protocols/twitter',
     'protocols/xmpp',
     'protocols/yahoo',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     DIRS += ['protocols/jsTest']
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'chat-prefs.js',
 ]
 

--- a/editor/ui/moz.build
+++ b/editor/ui/moz.build
@@ -14,11 +14,11 @@ if not CONFIG['MOZ_STANDALONE_COMPOSER']
 
 EXTRA_JS_MODULES += [
     'editorUtilities.jsm',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
 
 if not CONFIG['MOZ_STANDALONE_COMPOSER']:
-    JS_PREFERENCE_FILES += [
+    JS_PREFERENCE_PP_FILES += [
         'composer.js'
     ]

--- a/im/app/moz.build
+++ b/im/app/moz.build
@@ -44,13 +44,13 @@ if CONFIG['MOZ_LINKER']:
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = True
 
 DISABLE_STL_WRAPPING = True
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'profile/all-instantbird.js',
     'profile/channel-prefs.js',
 ]
 

--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -44,13 +44,11 @@ if CONFIG['MOZ_LINKER']:
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = True
 
 DISABLE_STL_WRAPPING = True
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'profile/all-thunderbird.js',
-    'profile/channel-prefs.js',
 ]
-

--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -80,12 +80,11 @@ TESTING_JS_MODULES.mailnews += [
 TEST_HARNESS_FILES.xpcshell.mailnews.data += [
     '/mailnews/test/data/**',
 ]
 
 TEST_HARNESS_FILES.xpcshell.mailnews.resources += [
     '/mailnews/test/resources/**',
 ]
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'mailnews.js',
 ]
-

--- a/suite/browser/moz.build
+++ b/suite/browser/moz.build
@@ -16,12 +16,12 @@ EXTRA_COMPONENTS += [
 JAR_MANIFESTS += ['jar.mn']
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_DISPLAYNAME', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['OFFICIAL_BUILD'] = 1
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'browser-prefs.js',
 ]