diff --git a/FAQ.md b/FAQ.md
index 1dcb713c01..33a743a41e 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -926,7 +926,7 @@ consider switching to a modern provider which supports push messages (IMAP IDLE)
If your device has an [AMOLED](https://en.wikipedia.org/wiki/AMOLED) screen,
you can save battery usage while viewing messages by switching to the black theme.
-Finally, make sure you are using [the latest version](https://github.com/M66B/open-source-email/releases/).
+Finally, make sure you are using [the latest version](https://github.com/M66B/FairEmail/releases/).
@@ -1854,7 +1854,7 @@ Permanently delete messages from other folders would defeat the purpose of the t
~~You can solve this in two ways:~~
-* ~~Switch to the official version of FairEmail, see [here](https://github.com/M66B/open-source-email/blob/master/README.md#downloads) for the options~~
+* ~~Switch to the official version of FairEmail, see [here](https://github.com/M66B/FairEmail/blob/master/README.md#downloads) for the options~~
* ~~Use app specific passwords, see [this FAQ](#user-content-faq6)~~
~~Using *select account* in third party builds is not possible in recent versions anymore.~~
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index e3fbeb26d3..3362cbabae 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -5,12 +5,12 @@
# Feature request
* Did you check if there wasn't a similar feature request?
-* Did you read [this FAQ](https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ15)?
+* Did you read [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ15)?
# Bug report
* Did you check if there wasn't a similar bug report?
-* Are you using the [latest version](https://github.com/M66B/open-source-email/releases) of the app?
+* Are you using the [latest version](https://github.com/M66B/FairEmail/releases) of the app?
## Expected behavior
diff --git a/PRIVACY.md b/PRIVACY.md
index 2646db3a4f..5fd8d6e3f8 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -9,14 +9,14 @@ FairEmail **does not** collect any information.
FairEmail **does not** store data on third party servers.
FairEmail **does not** require unnecessary permissions.
-For more information on permissions, see [this FAQ](https://github.com/M66B/open-source-email/blob/master/FAQ.md#user-content-faq1).
+For more information on permissions, see [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq1).
FairEmail **does not** allow other apps access to messages and attachments without your approval.
FairEmail **does** follow the recommendations of [this EFF article](https://www.eff.org/deeplinks/2019/01/stop-tracking-my-emails).
-FairEmail is 100 % **open source**, see [the license](https://github.com/M66B/open-source-email/blob/master/LICENSE).
+FairEmail is 100 % **open source**, see [the license](https://github.com/M66B/FairEmail/blob/master/LICENSE).
-Error reporting is **opt-in**, see [here](https://github.com/M66B/open-source-email/blob/master/FAQ.md#user-content-faq104) for more information.
+Error reporting is **opt-in**, see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq104) for more information.
Copyright © 2018-2019 Marcel Bokhorst.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 275762ef65..f6db90cd0b 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
# Important
-* Did you read the [contributing section](https://github.com/M66B/open-source-email#contributing)?
-* Do you agree to [the license and the copyright](https://github.com/M66B/open-source-email#license)?
+* Did you read the [contributing section](https://github.com/M66B/FairEmail#contributing)?
+* Do you agree to [the license and the copyright](https://github.com/M66B/FairEmail#license)?
diff --git a/README.md b/README.md
index c1dd7d91a0..4f1952719c 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ are preferred in the form of [pull requests](https://help.github.com/articles/cr
*Translations*
-* You can translate the in-app texts of FairEmail [on Crowdin](https://crowdin.com/project/FairEmail)
+* You can translate the in-app texts of FairEmail [on Crowdin](https://crowdin.com/project/open-source-email)
* If your language is not listed, please send a message through [this contact form](https://contact.faircode.eu/?product=other)
*Source code*
diff --git a/SETUP.md b/SETUP.md
index edecb84580..a50bea02e8 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -30,7 +30,7 @@ If your provider is not in the list of providers, select *Custom*.
Enter the domain name, for example *gmail.com* and tap *Get settings*.
If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the host name and port number,
else check the setup instructions of your provider for the right IMAP host name and port number.
-For more about this, please see [here](https://github.com/M66B/open-source-email/blob/master/FAQ.md#authorizing-accounts).
+For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts).
## Setup identity - to send email
@@ -39,7 +39,7 @@ Similarly, to add an identity, tap on *Manage identity* and tap on the orange *a
Enter the name you want to appear in de from address of the emails you send and select a linked account.
Tap *Save* to add the identity.
-See [this FAQ](https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ9) about using aliases.
+See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases.
## Grant permissions - to access contact information
@@ -57,4 +57,4 @@ Tap *Disable battery optimizations* and follow the instructions.
## Questions
-If you have a question or problem, please [see here](https://github.com/M66B/open-source-email/blob/master/FAQ.md).
+If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md).
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a332c2bc7e..491d2e332d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -749,7 +749,7 @@
List of pro features
Buy
Buying pro features will allow you to use all current and future pro features, will keep this app maintained, and supported
- Please see this FAQ about the price of the pro features
+ Please see this FAQ about the price of the pro features
Purchase pending
All pro features are activated
All pro features activated