--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -116,40 +116,40 @@ ifneq ($(OS_ARCH),OS2)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 endif
 
 NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
 
 BOOKMARKS_INC = $(firstword $(wildcard $(LOCALE_SRCDIR)/profile/bookmarks.inc) \
                             @srcdir@/en-US/profile/bookmarks.inc )
-MORE_BOOKMARKS_INC = $(firstword $(wildcard $(LOCALE_SRCDIR)/profile/more-bookmarks.inc) \
-                                 @srcdir@/en-US/profile/more-bookmarks.inc )
+BOOKMARKS_EXTRA = $(firstword $(wildcard $(LOCALE_SRCDIR)/profile/bookmarks.extra) \
+                              @srcdir@/en-US/profile/bookmarks.extra )
 
 %/defaults/profile/bookmarks.html: generic/profile/bookmarks.html.in
 	$(SYSINSTALL) -D $(dir $@)
 	$(RM) -rf profile/*bookmarks*
 	$(NSINSTALL) -D profile
 	# the #include in the .in file requires all to be in the same dir
-	cp $^ $(BOOKMARKS_INC) $(MORE_BOOKMARKS_INC) profile/
+	cp $^ $(BOOKMARKS_INC) $(BOOKMARKS_EXTRA) profile/
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py \
 	  -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
 	  profile/bookmarks.html.in \
 	  > $@
 
-PANELS_INC = $(firstword $(wildcard $(LOCALE_SRCDIR)/profile/panels.inc) \
-                         @srcdir@/en-US/profile/panels.inc )
+PANELS_EXTRA = $(firstword $(wildcard $(LOCALE_SRCDIR)/profile/panels.extra) \
+                           @srcdir@/en-US/profile/panels.extra )
 
 %/defaults/profile/panels.rdf: generic/profile/panels.rdf.in
 	$(SYSINSTALL) -D $(dir $@)
 	$(RM) -rf profile/panels*
 	$(NSINSTALL) -D profile
 	# the #include in the .in file requires all to be in the same dir
-	cp $^ $(PANELS_INC) profile/
-	sed -n 's/.*<RDF:Description about="\(.*\)">.*/        <RDF:li resource="\1"\/>/p' profile/panels.inc > profile/panels-urn.inc
+	cp $^ $(PANELS_EXTRA) profile/
+	sed -n 's/.*<RDF:Description about="\(.*\)">.*/        <RDF:li resource="\1"\/>/p' profile/panels.extra > profile/panels-urn.inc
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py profile/panels.rdf.in > $@
 
 SEARCH_PLUGINS = $(shell cat \
    $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
                @srcdir@/en-US/searchplugins/list.txt ) )
 
 %/defaults/profile/search.rdf: generic/profile/search.rdf.in
 	$(SYSINSTALL) -D $(dir $@)

copy from suite/locales/en-US/profile/more-bookmarks.inc
copy to suite/locales/en-US/profile/bookmarks.extra

copy from suite/locales/en-US/profile/panels.inc
copy to suite/locales/en-US/profile/panels.extra

--- a/suite/locales/filter.py
+++ b/suite/locales/filter.py
@@ -15,13 +15,13 @@ def test(mod, path, entity = None):
     return True
   if entity is None:
     # missing and obsolete files
     return not (re.match(r"searchplugins\/.+\.src", path) or
                 re.match(r"searchplugins\/.+\.png", path) or
                 re.match(r"chrome\/common\/help\/images\/[A-Za-z-_]+\.[a-z]+", path))
   if path == "defines.inc":
     return entity != "MOZ_LANGPACK_CONTRIBUTORS"
-  if path == "profile/more-bookmarks.inc" or path == "profile/panels.inc":
+  if path == "profile/bookmarks.extra" or path == "profile/panels.extra":
     # ignore files for additional bookmarks and panels
     return False
   
   return True

--- a/suite/locales/generic/profile/bookmarks.html.in
+++ b/suite/locales/generic/profile/bookmarks.html.in
@@ -38,11 +38,11 @@ Do Not Edit! -->
         </DL><p>
         <DT><H3>@community_support@</H3>
         <DL><p>
             <DT><A HREF="http://www.seamonkey-project.org/community">@seamonkey_community@</a>
             <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
             <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
         </DL><p>
     </DL><p>
-#include more-bookmarks.inc
+#include bookmarks.extra
     <HR>
 </DL><p>

--- a/suite/locales/generic/profile/panels.rdf.in
+++ b/suite/locales/generic/profile/panels.rdf.in
@@ -33,10 +33,10 @@
   <RDF:Description about="urn:sidebar:panel:history">
     <NC:title>&sidebar.client-history.label;</NC:title>
     <NC:content>chrome://communicator/content/history/history-panel.xul</NC:content>
   </RDF:Description>
   <RDF:Description about="urn:sidebar:panel:addressbook">
     <NC:title>&sidebar.client-addressbook.label;</NC:title>
     <NC:content>chrome://messenger/content/addressbook/addressbook-panel.xul</NC:content>
   </RDF:Description>
-#include panels.inc
+#include panels.extra
 </RDF:RDF>