diff --git a/Build/Symbols/DotNetNuke_Symbols.dnn b/Build/Symbols/DotNetNuke_Symbols.dnn
index 28970149c60..66c61580c51 100644
--- a/Build/Symbols/DotNetNuke_Symbols.dnn
+++ b/Build/Symbols/DotNetNuke_Symbols.dnn
@@ -4,8 +4,8 @@
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>
-        <name>DNN Corporation</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn
index 3b316789f0d..26521f5b1ba 100644
--- a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn	
+++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn	
@@ -5,8 +5,8 @@
             <description>Display children pages as icon links for navigation.</description>
             <iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
             <owner>
-                <name>DNN</name>
-                <organization>.NET Foundation</organization>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
                 <url>https://dnncommunity.org</url>
                 <email>info@dnncommunity.org</email>
             </owner>
diff --git a/DNN Platform/Components/MailKit/MailKit.dnn b/DNN Platform/Components/MailKit/MailKit.dnn
index cd31ca2a7ea..35687ade324 100644
--- a/DNN Platform/Components/MailKit/MailKit.dnn	
+++ b/DNN Platform/Components/MailKit/MailKit.dnn	
@@ -5,8 +5,8 @@
       <description>Libraries required for MailKit.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Microsoft.AspNetMvc/Microsoft.AspNetMvc.dnn b/DNN Platform/Components/Microsoft.AspNetMvc/Microsoft.AspNetMvc.dnn
index 07929cb4a94..cb2eba27bf2 100644
--- a/DNN Platform/Components/Microsoft.AspNetMvc/Microsoft.AspNetMvc.dnn	
+++ b/DNN Platform/Components/Microsoft.AspNetMvc/Microsoft.AspNetMvc.dnn	
@@ -5,8 +5,8 @@
       <description>Libraries required for ASP.NET MVC.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Microsoft.AspNetWebApi/Microsoft.AspNetWebApi.dnn b/DNN Platform/Components/Microsoft.AspNetWebApi/Microsoft.AspNetWebApi.dnn
index b59923285da..146b7ee3080 100644
--- a/DNN Platform/Components/Microsoft.AspNetWebApi/Microsoft.AspNetWebApi.dnn	
+++ b/DNN Platform/Components/Microsoft.AspNetWebApi/Microsoft.AspNetWebApi.dnn	
@@ -5,8 +5,8 @@
       <description>Libraries required for ASP.NET Web API.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Microsoft.AspNetWebPages/Microsoft.AspNetWebPages.dnn b/DNN Platform/Components/Microsoft.AspNetWebPages/Microsoft.AspNetWebPages.dnn
index 46021bbd7ad..23b15d5a012 100644
--- a/DNN Platform/Components/Microsoft.AspNetWebPages/Microsoft.AspNetWebPages.dnn	
+++ b/DNN Platform/Components/Microsoft.AspNetWebPages/Microsoft.AspNetWebPages.dnn	
@@ -5,8 +5,8 @@
       <description>Libraries required for ASP.NET Web Pages (i.e. Razor and helpers).</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dnn b/DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dnn
index 1eaf7d360c0..4db82256e1f 100644
--- a/DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dnn	
+++ b/DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dnn	
@@ -5,8 +5,8 @@
       <description>Provides compiler support for C# 7.3 and VB 15.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.dnn b/DNN Platform/Components/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.dnn
index 13c497584ea..847471fb442 100644
--- a/DNN Platform/Components/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.dnn	
+++ b/DNN Platform/Components/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.dnn	
@@ -5,8 +5,8 @@
       <description>Provides file globbing support for DotNetNuke.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn b/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn
index 1cdb93fbb3b..b317416fc0e 100644
--- a/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn	
+++ b/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn	
@@ -5,8 +5,8 @@
       <description>Provides Newtonsoft Json Components for DotNetNuke.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn b/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn
index 810cac2733a..90d364c8a46 100644
--- a/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn	
+++ b/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn	
@@ -5,8 +5,8 @@
       <description>Provides Telerik Components for DotNetNuke.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Connectors/Azure/AzureConnector.dnn b/DNN Platform/Connectors/Azure/AzureConnector.dnn
index e1bd9f18bb5..07c47d12ee6 100644
--- a/DNN Platform/Connectors/Azure/AzureConnector.dnn	
+++ b/DNN Platform/Connectors/Azure/AzureConnector.dnn	
@@ -8,8 +8,8 @@
             <dependency type="CoreVersion">09.02.00</dependency>
           </dependencies>
             <owner>
-                <name>DNN</name>
-                <organization>.NET Foundation</organization>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
                 <url>https://dnncommunity.org</url>
                 <email>info@dnncommunity.org</email>
             </owner>
diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn
index a4888620f61..d699b26dfa8 100644
--- a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn	
+++ b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn	
@@ -8,10 +8,10 @@
             <dependency type="CoreVersion">09.02.00</dependency>
           </dependencies>
           <owner>
-              <name>DNN Community</name>
-              <organization>.NET Foundation and Contributors</organization>
-              <url>https://dnncommunity.org</url>
-              <email>info@dnncommunity.org</email>
+              <name>.NET Foundation and Contributors</name>
+            <organization>DNN Community</organization>
+            <url>https://dnncommunity.org</url>
+            <email>info@dnncommunity.org</email>
             </owner>
             <license src="license.txt" />
             <releaseNotes src="releaseNotes.txt" />
diff --git a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn
index 057f1f91700..f91b9d5a8b2 100644
--- a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn	
+++ b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn	
@@ -8,10 +8,10 @@
             <dependency type="CoreVersion">09.02.00</dependency>
           </dependencies>
           <owner>
-              <name>DNN Community</name>
-              <organization>.NET Foundation and Contributors</organization>
-              <url>https://dnncommunity.org</url>
-              <email>info@dnncommunity.org</email>
+              <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
+        <url>https://dnncommunity.org</url>
+        <email>info@dnncommunity.org</email>
             </owner>
             <license src="license.txt" />
             <releaseNotes src="releaseNotes.txt" />
diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
index a49dc005d76..6468ce32536 100644
--- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn	
+++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn	
@@ -5,8 +5,8 @@
       <description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn b/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn
index 3684943c791..c3090e25c9a 100644
--- a/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn	
+++ b/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn	
@@ -5,8 +5,8 @@
       <description>DNN Deprecated Web Controls library for legacy Telerik depepndency</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn
index 893231adfb4..b13b4bf980b 100644
--- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn	
+++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn	
@@ -5,10 +5,10 @@
             <description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
             <dependencies/>
             <owner>
-                <name>DotNetNuke</name>
-                <organization>DotNetNuke Corporation</organization>
-                <url>www.dotnetnuke.com</url>
-                <email>jon.henning@dotnetnuke.com</email>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
+                <url>https://dnncommunity.org</url>
+                <email>info@dnncommunity.org</email>
             </owner>
             <license src="license.txt" />
             <releaseNotes src="releaseNotes.txt" />
diff --git a/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn b/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn
index 7cb0b36eae8..ca90574eca9 100644
--- a/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn	
+++ b/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn	
@@ -5,8 +5,8 @@
       <description>DNN Deprecated Website Codebehind files for backward compability.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/JavaScript Libraries/Knockout/Knockout.dnn b/DNN Platform/JavaScript Libraries/Knockout/Knockout.dnn
index 1ff689a124a..496e470a70e 100644
--- a/DNN Platform/JavaScript Libraries/Knockout/Knockout.dnn	
+++ b/DNN Platform/JavaScript Libraries/Knockout/Knockout.dnn	
@@ -5,8 +5,8 @@
       <description>Knockout is an MVVM library that is used for client side databinding.</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/JavaScript Libraries/KnockoutMapping/KnockoutMapping.dnn b/DNN Platform/JavaScript Libraries/KnockoutMapping/KnockoutMapping.dnn
index 0be6901405a..e4c3a7965b0 100644
--- a/DNN Platform/JavaScript Libraries/KnockoutMapping/KnockoutMapping.dnn	
+++ b/DNN Platform/JavaScript Libraries/KnockoutMapping/KnockoutMapping.dnn	
@@ -6,8 +6,8 @@
       Knockout ViewModels.</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/JavaScript Libraries/Selectize/Selectize.dnn b/DNN Platform/JavaScript Libraries/Selectize/Selectize.dnn
index f646ae7ca8a..273c9ae1ee3 100644
--- a/DNN Platform/JavaScript Libraries/Selectize/Selectize.dnn	
+++ b/DNN Platform/JavaScript Libraries/Selectize/Selectize.dnn	
@@ -5,8 +5,8 @@
       <description>Selectize is the hybrid of a textbox and select box. It's jQuery-based and it's useful for tagging, contact lists, country selectors, and so on.</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/JavaScript Libraries/jQuery/jQuery.dnn b/DNN Platform/JavaScript Libraries/jQuery/jQuery.dnn
index 0fbb7110aa2..f92f63afebb 100644
--- a/DNN Platform/JavaScript Libraries/jQuery/jQuery.dnn	
+++ b/DNN Platform/JavaScript Libraries/jQuery/jQuery.dnn	
@@ -5,8 +5,8 @@
       <description>jQuery is a JavaScript library that is used to manipulate the Document Object Model (DOM).</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/JavaScript Libraries/jQueryMigrate/jQueryMigrate.dnn b/DNN Platform/JavaScript Libraries/jQueryMigrate/jQueryMigrate.dnn
index a3d6c3f655a..2e12446fa58 100644
--- a/DNN Platform/JavaScript Libraries/jQueryMigrate/jQueryMigrate.dnn	
+++ b/DNN Platform/JavaScript Libraries/jQueryMigrate/jQueryMigrate.dnn	
@@ -5,8 +5,8 @@
       <description>A development tool to help migrate away from APIs and features that have been or will be removed from jQuery core</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn b/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn
index 72f3959fcf2..87781a8aa1b 100644
--- a/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn	
+++ b/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn	
@@ -5,8 +5,8 @@
       <description>jQueryUI is a JavaScript library that is used to extend jQuery to provide UI widgets.</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
index 35a182f456a..23e49bec0a0 100644
--- a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn	
+++ b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn	
@@ -5,8 +5,8 @@
       <description>Core Messaging module allows users to message each other.</description>
       <iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn
index f128ef27f46..f43d7096ce5 100644
--- a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn	
+++ b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn	
@@ -4,7 +4,8 @@
       <friendlyName>DDR Menu</friendlyName>
       <description>DotNetNuke Navigation Provider.</description>
       <owner>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn b/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn
index 0bee455ae60..26f039d8917 100644
--- a/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn	
+++ b/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn	
@@ -5,8 +5,8 @@
       <description>DotNetNuke Corporation Digital Asset Management module</description>
       <iconFile>Images/Files_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn
index 4c6c535154a..e74251b1af8 100644
--- a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn	
+++ b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn	
@@ -5,8 +5,8 @@
       <description>DotNetNuke Corporation Site Export Import Library</description>
       <iconFile>Images/Files_32x32_Standard.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/Groups/SocialGroups.dnn b/DNN Platform/Modules/Groups/SocialGroups.dnn
index 1386e630e24..8de8804894f 100644
--- a/DNN Platform/Modules/Groups/SocialGroups.dnn	
+++ b/DNN Platform/Modules/Groups/SocialGroups.dnn	
@@ -5,8 +5,8 @@
       <description>DotNetNuke Corporation Social Groups module</description>
       <iconFile>~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/HTML/dnn_HTML.dnn b/DNN Platform/Modules/HTML/dnn_HTML.dnn
index 11215452f72..9ba7d425982 100644
--- a/DNN Platform/Modules/HTML/dnn_HTML.dnn	
+++ b/DNN Platform/Modules/HTML/dnn_HTML.dnn	
@@ -5,8 +5,8 @@
       <description>This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.</description>
       <iconFile>DesktopModules\HTML\Images\html.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn
index 6ad9beceacb..3735e487f59 100644
--- a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn	
+++ b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn	
@@ -5,8 +5,8 @@
       <iconFile>Images/HtmlEditorManager_Standard_32x32.png</iconFile>
       <description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.</description>
       <owner>
-          <name>DNN</name>
-          <organization>.NET Foundation</organization>
+          <name>.NET Foundation and Contributors</name>
+          <organization>DNN Community</organization>
           <url>https://dnncommunity.org</url>
           <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/Journal/Journal.dnn b/DNN Platform/Modules/Journal/Journal.dnn
index cb85db9955c..2cbf7158cf2 100644
--- a/DNN Platform/Modules/Journal/Journal.dnn	
+++ b/DNN Platform/Modules/Journal/Journal.dnn	
@@ -5,8 +5,8 @@
             <description>DotNetNuke Corporation Journal module</description>
             <iconFile>DesktopModules/Journal/Images/journal_32X32.png</iconFile>
             <owner>
-                <name>DNN</name>
-                <organization>.NET Foundation</organization>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
                 <url>https://dnncommunity.org</url>
                 <email>info@dnncommunity.org</email>
             </owner>
diff --git a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
index e15645583a2..c807487f603 100644
--- a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn	
+++ b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn	
@@ -5,8 +5,8 @@
       <description>The Member Directory module displays a list of Members based on role, profile property or relationship.</description>
       <iconFile>~/DesktopModules/MemberDirectory/Images/member_list_32X32.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/RazorHost/RazorHost.dnn b/DNN Platform/Modules/RazorHost/RazorHost.dnn
index 3f9e4ca00a8..9c7832b89b3 100644
--- a/DNN Platform/Modules/RazorHost/RazorHost.dnn	
+++ b/DNN Platform/Modules/RazorHost/RazorHost.dnn	
@@ -4,8 +4,8 @@
       <friendlyName>Razor Host</friendlyName>
       <description>The Razor Host module allows developers to host Razor Scripts.</description>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn
index b0609eb9b09..07a7741d6df 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn	
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn	
@@ -5,8 +5,8 @@
       <description>This module allows you to manage files on the server</description>
       <iconFile>~/Images/icon_filemanager_32px.gif</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn
index e8d0349e8f3..96e3349f003 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn	
@@ -6,8 +6,8 @@
         Facebook authentication to authenticate users.
       </description>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn
index 376593543f0..8ddad85fb4d 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn	
@@ -6,8 +6,8 @@
         Google authentication to authenticate users.
       </description>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn
index a629ed90437..b5efd0a6893 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn	
@@ -7,8 +7,8 @@
         Live authentication to authenticate users.
       </description>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn
index 72122bafe1c..e5ac17287a9 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn	
@@ -7,8 +7,8 @@
         Twitter authentication to authenticate users.
       </description>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn
index 13c46b114c5..c23b2b1ad6b 100644
--- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn	
+++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn	
@@ -5,8 +5,8 @@
       <description>DotNetNuke Simple Web Farm Caching Provider</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn
index a725318c828..c979f9b88b5 100644
--- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn	
+++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn	
@@ -5,8 +5,8 @@
       <description>ASP.NET Device Detection / Client Capability Provider</description>
       <iconFile>~/Providers/ClientCapabilityProviders/AspNetClientCapabilityProvider/Images/mobiledevicedet_32X32.png</iconFile>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn
index 9aa641a7ef9..c5856b80e26 100644
--- a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn	
+++ b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn	
@@ -5,8 +5,8 @@
       <description>Azure Folder Providers for DotNetNuke.</description>
       <dependencies/>
       <owner>
-        <name>DNN</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>info@dnncommunity.org</email>
       </owner>
diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn
index 5971283d272..30ff4cba702 100644
--- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn	
+++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn	
@@ -1,15 +1,15 @@
 <dotnetnuke type="Package" version="5.0">
   <packages><package name="DNNConnect.CKEditorProvider" type="Provider" version="09.10.02">
 
-  <friendlyName>DNN Connect CKEditor Provider</friendlyName>
-  <description>CKEditor Provider by DNN Connect for DNN</description>
+  <friendlyName>CKEditor Provider</friendlyName>
+  <description>CKEditor Provider for DNN</description>
   <iconFile>~/Providers/HtmlEditorProviders/DNNConnect.CKE/LogoCKEditor.png</iconFile>
   <azureCompatible>true</azureCompatible>
   <owner>
-    <name></name>
-    <organization>DNN Connect</organization>
-    <url>http://dnn-connect.org/</url>
-    <email></email>
+    <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
+        <url>https://dnncommunity.org</url>
+        <email>info@dnncommunity.org</email>
   </owner>
   <license src="license.txt" />
   <releaseNotes src="releaseNotes.txt" />
diff --git a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
index b4e64b63c58..7a3f172c632 100644
--- a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn	
+++ b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn	
@@ -5,10 +5,10 @@
       <iconFile></iconFile>
       <description><![CDATA[A new default DNN skin]]></description>
       <owner>
-        <name>XCESS</name>
-        <organization><![CDATA[XCESS expertise center b.v.]]></organization>
-        <url><![CDATA[http://www.xcess.nl]]></url>
-        <email><![CDATA[info@xcess.nl]]></email>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
+        <url>https://dnncommunity.org</url>
+        <email>info@dnncommunity.org</email>
       </owner>
       <license src="license.htm" />
       <releaseNotes src="release_notes.htm" />
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
index 70598b4e88c..98efde589d6 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
@@ -5,8 +5,8 @@
             <description></description>
             <iconFile>~/Images/icon-personabarapp-32px.png</iconFile>
             <owner>
-                <name>DNN</name>
-                <organization>.NET Foundation</organization>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
                 <url>https://dnncommunity.org</url>
                 <email>info@dnncommunity.org</email>
             </owner>
diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
index 74c3379a84b..99463c9a217 100644
--- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
+++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
@@ -5,8 +5,8 @@
             <description></description>
             <dependencies/>
             <owner>
-                <name>DNN</name>
-                <organization>.NET Foundation</organization>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
                 <url>https://dnncommunity.org</url>
                 <email>info@dnncommunity.org</email>
             </owner>
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn
index 74f9c745fcc..77623a04c8b 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn
@@ -5,8 +5,8 @@
             <description></description>
             <dependencies/>
             <owner>
-                <name>DNN</name>
-                <organization>.NET Foundation</organization>
+                <name>.NET Foundation and Contributors</name>
+                <organization>DNN Community</organization>
                 <url>https://dnncommunity.org</url>
                 <email>info@dnncommunity.org</email>
             </owner>