diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index f6f41b5ffc..bf213fe87f 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -28,7 +28,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE bitmap2component.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME bitmap2component )
 endif()
 
diff --git a/bitmap2component/Info.plist b/bitmap2component/Info.plist
index f39f5a5dff..de6b7e483a 100644
--- a/bitmap2component/Info.plist
+++ b/bitmap2component/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>bitmap2component.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.kicad-eda.bitmap2component</string>
+	<string>org.kicad-pcb.bitmap2component</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 1a42796e25..5a00f2c569 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -69,7 +69,7 @@ if( false )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME cvpcb )
 endif()
 
diff --git a/cvpcb/Info.plist b/cvpcb/Info.plist
index 9248420e5f..4c6a7a3383 100644
--- a/cvpcb/Info.plist
+++ b/cvpcb/Info.plist
@@ -27,7 +27,7 @@
 	<key>CFBundleIconFile</key>
 	<string>cvpcb.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.kicad-eda.cvpcb</string>
+	<string>org.kicad-pcb.cvpcb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 49e0c31926..462cd276ee 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -220,7 +220,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE eeschema.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME eeschema )
 endif()
 
diff --git a/eeschema/Info.plist b/eeschema/Info.plist
index 861d9856e4..7d8663d2f6 100644
--- a/eeschema/Info.plist
+++ b/eeschema/Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundleExecutable</key>                   <string>eeschema</string>
     <key>CFBundleGetInfoString</key>                <string></string>
     <key>CFBundleIconFile</key>                     <string>eeschema.icns</string>
-    <key>CFBundleIdentifier</key>                   <string>org.kicad-eda.eeschema</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad-pcb.eeschema</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string></string>
     <key>CFBundleName</key>                         <string>EESchema</string>
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index d9f99ab09f..e050db90ac 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -90,7 +90,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE gerbview.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME gerbview )
 endif()
 
diff --git a/gerbview/Info.plist b/gerbview/Info.plist
index a37434eca2..f3dbf5c078 100644
--- a/gerbview/Info.plist
+++ b/gerbview/Info.plist
@@ -39,7 +39,7 @@
     <key>CFBundleExecutable</key>                   <string>gerbview</string>
     <key>CFBundleGetInfoString</key>                <string></string>
     <key>CFBundleIconFile</key>                     <string>gerbview.icns</string>
-    <key>CFBundleIdentifier</key>                   <string>org.kicad-eda.gerbview</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad-pcb.gerbview</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string></string>
     <key>CFBundleName</key>                         <string>GerbView</string>
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 2a3fd0db28..887b7b5da6 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -36,7 +36,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE kicad.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME kicad )
 endif()
 
diff --git a/kicad/Info.plist b/kicad/Info.plist
index 791a798b88..9bb140d832 100644
--- a/kicad/Info.plist
+++ b/kicad/Info.plist
@@ -18,7 +18,7 @@
     <key>CFBundleExecutable</key>	                <string>kicad</string>
     <key>CFBundleGetInfoString</key>                <string></string>
     <key>CFBundleIconFile</key>	                    <string>kicad.icns</string>
-    <key>CFBundleIdentifier</key>	                <string>org.kicad-eda.kicad</string>
+    <key>CFBundleIdentifier</key>	                <string>org.kicad-pcb.kicad</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>	        <string></string>
     <key>CFBundleName</key>	                        <string>KiCad</string>
diff --git a/packaging/mac-osx/osx-package.pmdoc/01kicad-contents.xml b/packaging/mac-osx/osx-package.pmdoc/01kicad-contents.xml
deleted file mode 100644
index af0a6c9258..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/01kicad-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="kicad.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad/kicad/kicad.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="kicad" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="kicad.icns" o="marco" g="staff" p="33188"/><f n="kicad_doc.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/01kicad.xml b/packaging/mac-osx/osx-package.pmdoc/01kicad.xml
deleted file mode 100644
index 15eee19d41..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/01kicad.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="E6FF1347-A729-4B59-AA3A-52F76A70705F"><config><identifier>net.sourceforge.kicad.kicad</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../kicad/kicad.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>01kicad-contents.xml</file-list><component id="org.kicad-eda.kicad" path="/Users/marco/Development/kicad/kicad/kicad/kicad.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-52"><search-rule><combo identifier="org.kicad-eda.kicad" default-path="/Applications/Kicad/kicad.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/02gerbview-contents.xml b/packaging/mac-osx/osx-package.pmdoc/02gerbview-contents.xml
deleted file mode 100644
index b8dbefaa61..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/02gerbview-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="gerbview.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad/gerbview/gerbview.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="gerbview" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="gerbview.icns" o="marco" g="staff" p="33188"/><f n="gerbview_doc.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/02gerbview.xml b/packaging/mac-osx/osx-package.pmdoc/02gerbview.xml
deleted file mode 100644
index 91ef831454..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/02gerbview.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="052237DB-F6F2-4879-B340-1F7FDFC6F7DB"><config><identifier>net.sourceforge.kicad.gerbview</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../gerbview/gerbview.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>02gerbview-contents.xml</file-list><component id="org.kicad-eda.gerbview" path="/Users/marco/Development/kicad/kicad/gerbview/gerbview.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-65"><search-rule><combo identifier="org.kicad-eda.gerbview" default-path="/Applications/Kicad/gerbview.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/03eeschema-contents.xml b/packaging/mac-osx/osx-package.pmdoc/03eeschema-contents.xml
deleted file mode 100644
index 1ab6f08f84..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/03eeschema-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="eeschema.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad/eeschema/eeschema.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="eeschema" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="eeschema.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/03eeschema.xml b/packaging/mac-osx/osx-package.pmdoc/03eeschema.xml
deleted file mode 100644
index f3db39cb3f..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/03eeschema.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="80058898-14C5-49A3-A029-51772838B06A"><config><identifier>net.sourceforge.kicad.eeschema</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../eeschema/eeschema.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>03eeschema-contents.xml</file-list><component id="org.kicad-eda.eeschema" path="/Users/marco/Development/kicad/kicad/eeschema/eeschema.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-30"><search-rule><combo identifier="org.kicad-eda.eeschema" default-path="/Applications/Kicad/eeschema.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/04pcbnew-contents.xml b/packaging/mac-osx/osx-package.pmdoc/04pcbnew-contents.xml
deleted file mode 100644
index 1c56391fd1..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/04pcbnew-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="pcbnew.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad/pcbnew/pcbnew.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="pcbnew" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="pcbnew.icns" o="marco" g="staff" p="33188"/><f n="pcbnew_doc.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/04pcbnew.xml b/packaging/mac-osx/osx-package.pmdoc/04pcbnew.xml
deleted file mode 100644
index 88df38827d..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/04pcbnew.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="A8FF90DF-E294-48A7-B0BF-5B0427561E39"><config><identifier>net.sourceforge.kicad.pcbnew</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../pcbnew/pcbnew.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>04pcbnew-contents.xml</file-list><component id="org.kicad-eda.pcbnew" path="/Users/marco/Development/kicad/kicad/pcbnew/pcbnew.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-69"><search-rule><combo identifier="org.kicad-eda.pcbnew" default-path="/Applications/Kicad/pcbnew.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/05cvpcb-contents.xml b/packaging/mac-osx/osx-package.pmdoc/05cvpcb-contents.xml
deleted file mode 100644
index dd0a34401b..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/05cvpcb-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="cvpcb.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad/cvpcb/cvpcb.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="cvpcb" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="cvpcb.icns" o="marco" g="staff" p="33188"/><f n="cvpcb_doc.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/05cvpcb.xml b/packaging/mac-osx/osx-package.pmdoc/05cvpcb.xml
deleted file mode 100644
index 373c9d2d79..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/05cvpcb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="E8C63B60-3F92-42E1-B00D-B70F35BE08A5"><config><identifier>net.sourceforge.kicad.cvpcb</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../cvpcb/cvpcb.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>05cvpcb-contents.xml</file-list><component id="org.kicad-eda.cvpcb" path="/Users/marco/Development/kicad/kicad/cvpcb/cvpcb.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-73"><search-rule><combo identifier="org.kicad-eda.cvpcb" default-path="/Applications/Kicad/cvpcb.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/06bitmap-contents.xml b/packaging/mac-osx/osx-package.pmdoc/06bitmap-contents.xml
deleted file mode 100644
index ba0f55e6c3..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/06bitmap-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="bitmap2component.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad/bitmap2component/bitmap2component.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="bitmap2component" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="bitmap2component.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/06bitmap.xml b/packaging/mac-osx/osx-package.pmdoc/06bitmap.xml
deleted file mode 100644
index 15e0a9411e..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/06bitmap.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="7E583994-AFBA-404C-916F-A1DFE3A2B504"><config><identifier>net.sourceforge.kicad.kicad.bitmap2component.pkg</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">../../bitmap2component/bitmap2component.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>parent</mod><mod>installTo</mod></config><contents><file-list>06bitmap-contents.xml</file-list><component id="org.kicad-eda.bitmap2component" path="/Users/marco/Development/kicad/kicad/bitmap2component/bitmap2component.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-16"><search-rule><combo identifier="org.kicad-eda.bitmap2component" default-path="/Applications/bitmap2component.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/mac-osx/osx-package.pmdoc/index.xml b/packaging/mac-osx/osx-package.pmdoc/index.xml
deleted file mode 100644
index 65261755d0..0000000000
--- a/packaging/mac-osx/osx-package.pmdoc/index.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkmkdoc spec="1.12"><properties><title>Kicad</title><build>/Users/marco/Development/Kicad-27-Dec-2010.mpkg</build><organization>net.sourceforge.kicad</organization><userSees ui="both"/><min-target os="2"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="kicad" id="choice12" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.kicad"/></choice><choice title="gerbview" id="choice13" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.gerbview"/></choice><choice title="eeschema" id="choice14" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.eeschema"/></choice><choice title="pcbnew" id="choice15" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.pcbnew"/></choice><choice title="cvpcb" id="choice16" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.cvpcb"/></choice><choice title="bitmap2component" id="choice17" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.kicad.bitmap2component.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="license">../../AUTHORS.txt</resource><resource relative="true" mod="true" type="readme">../../CHANGELOG.txt</resource></locale></resources><flags/><item type="file">01kicad.xml</item><item type="file">02gerbview.xml</item><item type="file">03eeschema.xml</item><item type="file">04pcbnew.xml</item><item type="file">05cvpcb.xml</item><item type="file">06bitmap.xml</item><mod>properties.title</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
\ No newline at end of file
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index f28999ed77..094663aaf8 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -63,7 +63,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE pl_editor.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME pl_editor )
 endif()
 
diff --git a/pagelayout_editor/Info.plist b/pagelayout_editor/Info.plist
index 060ef24ce9..169550fedd 100644
--- a/pagelayout_editor/Info.plist
+++ b/pagelayout_editor/Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundleExecutable</key>                   <string>pl_editor</string>
     <key>CFBundleGetInfoString</key>                <string></string>
     <key>CFBundleIconFile</key>                     <string>pl_editor.icns</string>
-    <key>CFBundleIdentifier</key>                   <string>org.kicad-eda.pl_editor</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad-pcb.pl_editor</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string></string>
     <key>CFBundleName</key>                         <string>pl_editor</string>
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index 97b4bc22d3..fcde2f7678 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -49,7 +49,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE pcb_calculator.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME pcb_calculator )
 endif()
 
diff --git a/pcb_calculator/Info.plist b/pcb_calculator/Info.plist
index d54598b872..d6bf5beaa6 100644
--- a/pcb_calculator/Info.plist
+++ b/pcb_calculator/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>pcb_calculator.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.kicad-eda.pcb_calculator</string>
+	<string>org.kicad-pcb.pcb_calculator</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index d044ee4712..12490691be 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -510,7 +510,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE pcbnew.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
     set( MACOSX_BUNDLE_NAME pcbnew )
 endif()
 
diff --git a/pcbnew/Info.plist b/pcbnew/Info.plist
index 3f31259d06..f9da1a782f 100644
--- a/pcbnew/Info.plist
+++ b/pcbnew/Info.plist
@@ -21,7 +21,7 @@
     <key>CFBundleExecutable</key>               <string>pcbnew</string>
     <key>CFBundleGetInfoString</key>            <string></string>
     <key>CFBundleIconFile</key>                 <string>pcbnew.icns</string>
-    <key>CFBundleIdentifier</key>               <string>org.kicad-eda.pcbnew</string>
+    <key>CFBundleIdentifier</key>               <string>org.kicad-pcb.pcbnew</string>
     <key>CFBundleInfoDictionaryVersion</key>    <string>6.0</string>
     <key>CFBundleLongVersionString</key>        <string></string>
     <key>CFBundleName</key>                     <string>PCBNew</string>