diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 91188e2e87..43431a23b6 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -37,7 +37,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE bitmap2component.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME bitmap2component )
 endif()
 
diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index 89ac61685d..57c983c172 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -130,11 +130,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "The official KiCad website - " )
-                << HtmlHyperlink( "http://www.kicad-pcb.org" )
-                << "</li>";
-    description << "<li>"
-                << _( "Developer website on Launchpad - " )
-                << HtmlHyperlink( "https://launchpad.net/kicad" )
+                << HtmlHyperlink( "https://www.kicad.org" )
                 << "</li>";
 
     description << "<li>"
@@ -163,7 +159,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "KiCad forum - " )
-                << HtmlHyperlink( "https://forum.kicad.info" )
+                << HtmlHyperlink( "https://go.kicad.org/forum" )
                 << "</li>";
 
     description << "</ul></p>";
diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 71cc35d2dd..8bd442ea90 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -47,7 +47,7 @@
 /// The default auto save interval is 10 minutes.
 #define DEFAULT_AUTO_SAVE_INTERVAL 600
 
-#define URL_GET_INVOLVED "http://kicad-pcb.org/contribute/"
+#define URL_GET_INVOLVED "https://www.kicad.org/contribute/"
 
 ///@{
 /// \ingroup config
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index e8108b8c33..1e14e37090 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -304,7 +304,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE eeschema.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME eeschema )
 endif()
 
diff --git a/eeschema/dialogs/dialog_bom_help.html b/eeschema/dialogs/dialog_bom_help.html
index 174462e139..92d51bbfe3 100644
--- a/eeschema/dialogs/dialog_bom_help.html
+++ b/eeschema/dialogs/dialog_bom_help.html
@@ -44,7 +44,7 @@ Full documentation:</h1>
 <font face="Times New Roman, serif"><font size="3" style="font-size: 12pt"><span style="font-weight: normal">The
 </span><i><b>Eeschema documentation</b></i> <span style="font-weight: normal">describes
 this </span><b>intermediate netlist and gives examples<br></b><span style="font-weight: normal">See </span>
-<i><b>http://docs.kicad-pcb.org/stable/en/eeschema.html#creating-customized-netlists-and-bom-files</b></i></font></font></p>
+<i><b>https://go.kicad.org/docs/5.1/en/eeschema/eeschema.html#creating-customized-netlists-and-bom-files</b></i></font></font></p>
 <h1 class="western"><i>2 - </i>The intermediate Netlist File</h1>
 <p lang="en-US" class="western" style="margin-bottom: 0cm; widows: 0; orphans: 0; page-break-before: auto; page-break-after: auto">
 <font face="Times New Roman, serif"><font size="3" style="font-size: 12pt">BOM
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 2de83d8018..6dbf0aa979 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -102,7 +102,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE gerbview.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME gerbview )
 endif()
 
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index d4838d080c..f61079f390 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -45,7 +45,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE kicad.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME kicad )
 endif()
 
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 8c05661331..aa33092888 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -64,7 +64,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE pl_editor.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME pl_editor )
 endif()
 
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index f4431b9236..3be73f6be4 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -50,7 +50,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE pcb_calculator.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME pcb_calculator )
 endif()
 
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index d43909774a..92d9c3dd3e 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -592,7 +592,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE pcbnew.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME pcbnew )
 endif()
 
diff --git a/pcbnew/github/github_getliblist.cpp b/pcbnew/github/github_getliblist.cpp
index 25dcaf1749..2ba2185647 100644
--- a/pcbnew/github/github_getliblist.cpp
+++ b/pcbnew/github/github_getliblist.cpp
@@ -217,7 +217,7 @@ bool GITHUB_GETLIBLIST::remoteGetJSON( const std::string& aFullURLCommand, wxStr
     wxLogDebug( wxT( "Attempting to download: " ) + aFullURLCommand );
 
     kcurl.SetURL( aFullURLCommand );
-    kcurl.SetUserAgent( "http://kicad-pcb.org" );
+    kcurl.SetUserAgent( "https://www.kicad.org" );
     kcurl.SetHeader( "Accept", m_option_string );
     kcurl.SetFollowRedirects( true );
 
diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp
index 57593403b3..2302ebadb3 100644
--- a/pcbnew/github/github_plugin.cpp
+++ b/pcbnew/github/github_plugin.cpp
@@ -582,7 +582,7 @@ void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL )
     KICAD_CURL_EASY kcurl;      // this can THROW_IO_ERROR
 
     kcurl.SetURL( zip_url.c_str() );
-    kcurl.SetUserAgent( "http://kicad-pcb.org" );
+    kcurl.SetUserAgent( "https://www.kicad.org" );
     kcurl.SetHeader( "Accept", "application/zip" );
     kcurl.SetFollowRedirects( true );
 
diff --git a/resources/linux/appdata/kicad.appdata.xml.in b/resources/linux/appdata/kicad.appdata.xml.in
index f604ca8df1..bd214d8bb2 100644
--- a/resources/linux/appdata/kicad.appdata.xml.in
+++ b/resources/linux/appdata/kicad.appdata.xml.in
@@ -86,10 +86,10 @@
     </screenshot>
   </screenshots>
 
-  <url type="homepage">https://kicad.org/</url>
-  <url type="bugtracker">https://kicad.org/help/report-a-bug/</url>
-  <url type="help">https://docs.kicad.org/</url>
-  <url type="donation">https://kicad.org/</url>
+  <url type="homepage">https://www.kicad.org/</url>
+  <url type="bugtracker">https://go.kicad.org/issue</url>
+  <url type="help">https://go.kicad.org/docs/5.1</url>
+  <url type="donation">https://go.kicad.org/donate</url>
 
   <update_contact>kicad-developers@lists.launchpad.net</update_contact>
   <developer_name>The KiCad Developers</developer_name>
diff --git a/resources/macos/plist/bitmap2component.Info.plist.in b/resources/macos/plist/bitmap2component.Info.plist.in
index c1523212f8..64ad7ba547 100644
--- a/resources/macos/plist/bitmap2component.Info.plist.in
+++ b/resources/macos/plist/bitmap2component.Info.plist.in
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>             <string>bitmap2component</string>
     <key>CFBundleGetInfoString</key>          <string></string>
     <key>CFBundleIconFile</key>               <string>bitmap2component.icns</string>
-    <key>CFBundleIdentifier</key>             <string>org.kicad-pcb.bitmap2component</string>
+    <key>CFBundleIdentifier</key>             <string>org.kicad.bitmap2component</string>
     <key>CFBundleInfoDictionaryVersion</key>  <string>6.0</string>
     <key>CFBundleLongVersionString</key>      <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                   <string>Bitmap 2 Component</string>
diff --git a/resources/macos/plist/eeschema.Info.plist.in b/resources/macos/plist/eeschema.Info.plist.in
index 733c06483b..4ad7701f89 100644
--- a/resources/macos/plist/eeschema.Info.plist.in
+++ b/resources/macos/plist/eeschema.Info.plist.in
@@ -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-pcb.eeschema</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad.eeschema</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                         <string>Eeschema</string>
diff --git a/resources/macos/plist/gerbview.Info.plist.in b/resources/macos/plist/gerbview.Info.plist.in
index 685b472da1..4c5b74718f 100644
--- a/resources/macos/plist/gerbview.Info.plist.in
+++ b/resources/macos/plist/gerbview.Info.plist.in
@@ -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-pcb.gerbview</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad.gerbview</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                         <string>GerbView</string>
diff --git a/resources/macos/plist/kicad.Info.plist.in b/resources/macos/plist/kicad.Info.plist.in
index 9bfe7b9b9a..1a97e49606 100644
--- a/resources/macos/plist/kicad.Info.plist.in
+++ b/resources/macos/plist/kicad.Info.plist.in
@@ -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-pcb.kicad</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad.kicad</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                         <string>KiCad</string>
diff --git a/resources/macos/plist/pcb_calculator.Info.plist.in b/resources/macos/plist/pcb_calculator.Info.plist.in
index eaf340c9fa..af72d31d1d 100644
--- a/resources/macos/plist/pcb_calculator.Info.plist.in
+++ b/resources/macos/plist/pcb_calculator.Info.plist.in
@@ -6,7 +6,7 @@
     <key>CFBundleExecutable</key>              <string>pcb_calculator</string>
     <key>CFBundleGetInfoString</key>           <string></string>
     <key>CFBundleIconFile</key>                <string>pcb_calculator.icns</string>
-    <key>CFBundleIdentifier</key>              <string>org.kicad-pcb.pcb_calculator</string>
+    <key>CFBundleIdentifier</key>              <string>org.kicad.pcb_calculator</string>
     <key>CFBundleInfoDictionaryVersion</key>   <string>6.0</string>
     <key>CFBundleLongVersionString</key>       <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                    <string>PCB Calculator</string>
diff --git a/resources/macos/plist/pcbnew.Info.plist.in b/resources/macos/plist/pcbnew.Info.plist.in
index 038af9db14..e4ac4aa6b1 100644
--- a/resources/macos/plist/pcbnew.Info.plist.in
+++ b/resources/macos/plist/pcbnew.Info.plist.in
@@ -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-pcb.pcbnew</string>
+    <key>CFBundleIdentifier</key>               <string>org.kicad.pcbnew</string>
     <key>CFBundleInfoDictionaryVersion</key>    <string>6.0</string>
     <key>CFBundleLongVersionString</key>        <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                     <string>Pcbnew</string>
diff --git a/resources/macos/plist/pleditor.Info.plist.in b/resources/macos/plist/pleditor.Info.plist.in
index 448d616d80..792ade6556 100644
--- a/resources/macos/plist/pleditor.Info.plist.in
+++ b/resources/macos/plist/pleditor.Info.plist.in
@@ -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-pcb.pl_editor</string>
+    <key>CFBundleIdentifier</key>                   <string>org.kicad.pl_editor</string>
     <key>CFBundleInfoDictionaryVersion</key>        <string>6.0</string>
     <key>CFBundleLongVersionString</key>            <string>@KICAD_VERSION_FULL@</string>
     <key>CFBundleName</key>                         <string>Page Layout Editor</string>