From 9cabe11a278c8d2338b4ff64769f1208d8b2be78 Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Mon, 11 May 2020 02:33:48 -0500
Subject: [PATCH] Move @privacytoolsIO to @privacytools (#1904)

---
 .github/CODEOWNERS                             | 10 +++++-----
 .github/CONTRIBUTING.md                        |  8 ++++----
 .github/ISSUE_TEMPLATE/5_Website_Issues.md     |  2 +-
 .github/ISSUE_TEMPLATE/config.yml              |  2 +-
 .github/PULL_REQUEST_TEMPLATE.md               |  4 ++--
 .well-known/security.txt                       |  2 +-
 README.md                                      |  5 ++---
 _includes/footer.html                          |  2 +-
 _includes/head.html                            |  2 +-
 _includes/sections/participate.html            |  4 ++--
 .../sections/self-contained-networks.html      |  2 +-
 pages/about.html                               | 10 +++++-----
 pages/about/librejs.html                       |  6 +++---
 pages/notices.md                               | 18 +++++++++---------
 pages/privacy.md                               |  4 ++--
 15 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e6b1f0b6..332444a5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,9 +1,9 @@
 # Editorial Team
-*.md @privacytoolsIO/editorial
-/assets/ @privacytoolsIO/editorial
-/pages/ @privacytoolsIO/editorial
-/_includes/sections/ @privacytoolsIO/editorial
-/index.html @privacytoolsIO/editorial
+*.md @privacytools/editorial
+/assets/ @privacytools/editorial
+/pages/ @privacytools/editorial
+/_includes/sections/ @privacytools/editorial
+/index.html @privacytools/editorial
 /font/ @dawidpotocki
 
 # Administration Related Files
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 18a48127..2bda11ec 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -25,7 +25,7 @@ Please read this document in full before contributing.
 - Be constructive.
 - Please feel free to *review changes* in the *files changed* tab of any
   pull request at any time.
-- See also our [Code of Conduct](https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md)
+- See also our [Code of Conduct](https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md)
 
 ## Quality over Quantity
 
@@ -96,8 +96,8 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 ## Images
 
 - SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format.
-- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
-- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
+- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
+- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
 
 ## Licensing
 
@@ -111,4 +111,4 @@ If you do not have a GitHub account, you may submit software recommendations or
 
 This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue.
 
-You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444).
+You can view an example of the created issues' format at [#1444](https://github.com/privacytools/privacytools.io/issues/1444).
diff --git a/.github/ISSUE_TEMPLATE/5_Website_Issues.md b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
index fb386eaa..d2244637 100644
--- a/.github/ISSUE_TEMPLATE/5_Website_Issues.md
+++ b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
@@ -9,7 +9,7 @@ labels: 🌐 website issue
 
 READ ME FIRST:
 This is NOT the place to request changes to the content of the website.
-This is NOT the place to report issues with our services. (That is https://github.com/privacytoolsIO/services/issues/new)
+This is NOT the place to report issues with our services. (That is https://github.com/privacytools/services/issues/new)
 This is ONLY for reporting bugs or technical issues with www.privacytools.io.
 
 -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index b0fba705..52f4ca2b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 contact_links:
   - name: Services issues
-    url: https://github.com/privacytoolsIO/services/issues/new/choose
+    url: https://github.com/privacytools/services/issues/new/choose
     about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here.
   - name: PrivacyTools Community
     url: https://forum.privacytools.io/
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 19a53c5f..46a6286b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
@@ -8,7 +8,7 @@ Resolves: #none <!-- A link to the (discussion) issue resolved by this pull requ
 
 - [ ] I understand that by not opening an issue about a software/service/similar addition/removal, this pull request will be closed without merging.
 
-- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md).
 
 - [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software
 
diff --git a/.well-known/security.txt b/.well-known/security.txt
index 6e804b30..f77c69fd 100644
--- a/.well-known/security.txt
+++ b/.well-known/security.txt
@@ -2,4 +2,4 @@ Contact: admin@privacytools.io
 Encryption: https://www.jonaharagon.com/keys/
 Preferred-Languages: en
 Canonical: https://www.privacytools.io/.well-known/security.txt
-Policy: https://github.com/privacytoolsIO/privacytools.io/security/policy
+Policy: https://github.com/privacytools/privacytools.io/security/policy
diff --git a/README.md b/README.md
index e9156db9..bd76e7f9 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ _Encryption Against Global Mass Surveillance._
 
 It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
 
-**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytoolsIO/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
+**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytools/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
 
 If you want to discuss privacy in general, a new tool, or just something else, feel free to join [our Discourse community](https://forum.privacytools.io/) or our general Matrix room at [`#general:privacytools.io`](https://matrix.to/#/#general:privacytools.io) and start a discussion! This is a community project and we're aiming to deliver the best information available. Thank you for participating.
 
@@ -29,7 +29,6 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 # Support
 
 - [Donate.](https://www.privacytools.io/donate/)
-- [Liberapay](https://liberapay.com/privacytools.io/donate) or [Patreon.](https://www.patreon.com/privacytools)
 - [Spread the word.](https://www.privacytools.io/#participate)
 - [Join our Discourse community.](https://forum.privacytools.io/)
 - [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
@@ -51,4 +50,4 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 
 # License & Notices
 
-Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) in this repository.
+Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) in this repository.
diff --git a/_includes/footer.html b/_includes/footer.html
index aebf3140..9fb8047f 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -89,7 +89,7 @@
     <small>
       <a href="/privacy/">Privacy Statement</a> |
       <a href="/notices/">Notices &amp; Disclaimers</a> |
-      <a href="https://github.com/privacytoolsIO/brand">Brand Assets &amp; Guidelines</a> |
+      <a href="https://github.com/privacytools/brand">Brand Assets &amp; Guidelines</a> |
       <a href="https://status.privacytools.io">Status Page</a>
     </small>
 
diff --git a/_includes/head.html b/_includes/head.html
index 8595b009..45e6702c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -41,7 +41,7 @@
       "https://twitter.com/privacytoolsIO",
       "https://social.privacytools.io/@privacytools",
       "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
-      "https://github.com/privacytoolsIO"
+      "https://github.com/privacytools"
     ]
   }
   </script>
diff --git a/_includes/sections/participate.html b/_includes/sections/participate.html
index 57ac6b4b..d367dfbe 100644
--- a/_includes/sections/participate.html
+++ b/_includes/sections/participate.html
@@ -27,10 +27,10 @@
   {% include card.html color="warning"
   title="Develop on GitHub"
   font="fab fa-github"
-  url="https://github.com/privacytoolsIO/privacytools.io"
+  url="https://github.com/privacytools/privacytools.io"
   website="GitHub"
   description="The complete website source code is available on GitHub. Join our developer team!"
-  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytools/privacytools.io/graphs/contributors">Contributor List</a>'
   %}
 
 </div>
diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html
index b1c0c869..b3cb305a 100644
--- a/_includes/sections/self-contained-networks.html
+++ b/_includes/sections/self-contained-networks.html
@@ -65,7 +65,7 @@ github="https://github.com/freenet/"
   <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
   <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
-  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
+  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytools/privacytools.io/pull/361#issuecomment-344414022">
     <span class="badge badge-danger" data-toggle="tooltip" title="">
     <span class="fas fa-exclamation-triangle"></span>
         Important privacy warning
diff --git a/pages/about.html b/pages/about.html
index 92158aa5..b0a461d0 100644
--- a/pages/about.html
+++ b/pages/about.html
@@ -14,9 +14,9 @@ hidedesc: true
   <div class="col">
     <p itemprop="description"><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
     <p>At <strong itemprop="name">PrivacyTools</strong>, we provide services, tools, and knowledge to protect your <span itemprop="knowsAbout">privacy</span> against <span itemprop="knowsAbout">global mass surveillance</span>, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. <a itemprop="url" href="{{ site.production_url }}">This website</a> serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
-    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
+    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytools/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytools/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytools/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
     <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
-    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
+    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
   </div>
 </div>
 
@@ -122,7 +122,7 @@ website="https://www.reddit.com/user/trai_dep"
   <div class="col">
     <div class="card">
       <div class="card-body">
-        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytoolsio/">financial contributors</a>, <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
+        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytoolsio/">financial contributors</a>, <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
         <a href="/#participate" class="btn btn-primary"><i class="fas fa-hands-helping"></i> Get involved!</a>
         <a href="/donate/" class="btn btn-outline-danger"><i class="fas fa-heart"></i> Donate</a>
       </div>
@@ -151,14 +151,14 @@ emeritus=true
     <h2>Contact Us</h2>
     <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
     <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
-    <p><a href="https://github.com/privacytoolsIO/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
+    <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
     <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
     <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
     <p>Join our Matrix room at <code>#general:privacytools.io</code> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
     <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
     <link itemprop="sameAs" href="https://blog.privacytools.io">
     <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">
-    <link itemprop="sameAs" href="https://github.com/privacytoolsIO">
+    <link itemprop="sameAs" href="https://github.com/privacytools">
   </div>
 </div>
 </div>
diff --git a/pages/about/librejs.html b/pages/about/librejs.html
index c6608d07..8b130ecf 100644
--- a/pages/about/librejs.html
+++ b/pages/about/librejs.html
@@ -5,15 +5,15 @@ permalink: /about/javascript/
 <table id="jslicense-labels1" border="1">
   <tr>
     <td><a href="/assets/js/main.js">main.js</a></td>
-    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/applytheme.js">applytheme.js</a>
-    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/redirects.js">redirects.js</a></td>
-    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
diff --git a/pages/notices.md b/pages/notices.md
index 7b05d26b..c52f115a 100644
--- a/pages/notices.md
+++ b/pages/notices.md
@@ -19,24 +19,24 @@ PrivacyTools additionally does not warrant that this website will be constantly
 <span class="badge badge-secondary mt-5">Section 2</span>
 # Licenses
 
-<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt).</span>
+<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt).</span>
 
-In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) license.
+In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) license.
 
-**Content** on this website is based on [github.com/privacytoolsIO/privacytools.io](https://github.com/privacytoolsIO/privacytools.io) and is made freely available under the CC-1.0.
+**Content** on this website is based on [github.com/privacytools/privacytools.io](https://github.com/privacytools/privacytools.io) and is made freely available under the CC-1.0.
 
 Code, including source files and code samples if any in the content, is released under CC-1.0, with the following exceptions:
 
 - Bootstrap code is under the MIT license. See: [github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
-- [jQuery](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
-- [Popper.js](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
-- [Sortable](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
+- [jQuery](https://github.com/privacytools/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
+- [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
+- [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
 - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free)
-- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytoolsIO/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytoolsIO/privacytools.io/blob/master/font/LICENSE).
+- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE).
 
 Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub, released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).
 
-This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytoolsIO/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytoolsIO/brand).
+This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytools/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytools/brand).
 
 We believe that the logos and other images in `assets` from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *You are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*
 
@@ -55,4 +55,4 @@ You must not conduct any systematic or automated data collection activities on o
 - Data Mining
 - ‘Framing’ (IFrames)
 
-We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytoolsIO/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.
+We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytools/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.
diff --git a/pages/privacy.md b/pages/privacy.md
index 4ba67d37..c9b91967 100644
--- a/pages/privacy.md
+++ b/pages/privacy.md
@@ -7,7 +7,7 @@ description: "This Privacy Statement explains what information PrivacyTools and
 
 ## Who is {{ site.name }}?
 
-{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.
+{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytools/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.
 
 ## How does {{ site.name }} collect data about me?
 
@@ -120,4 +120,4 @@ This version of our privacy statement took effect October 9th, 2019.
 
 We will post any new versions of this statement at [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/) for the latest contact information at any time.
 
-A full [revision history](https://github.com/privacytoolsIO/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.
+A full [revision history](https://github.com/privacytools/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.