diff --git a/app/Import/JobConfiguration/FinTSConfigurationSteps.php b/app/Import/JobConfiguration/FinTSConfigurationSteps.php
index e41051934f..5144a4fe00 100644
--- a/app/Import/JobConfiguration/FinTSConfigurationSteps.php
+++ b/app/Import/JobConfiguration/FinTSConfigurationSteps.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FinTSConfigurationSteps.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/JobConfiguration/FinTSJobConfiguration.php b/app/Import/JobConfiguration/FinTSJobConfiguration.php
index 910c420cba..61f100b0f1 100644
--- a/app/Import/JobConfiguration/FinTSJobConfiguration.php
+++ b/app/Import/JobConfiguration/FinTSJobConfiguration.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FinTSJobConfiguration.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/Routine/FinTSRoutine.php b/app/Import/Routine/FinTSRoutine.php
index b838615c75..f43156b6e1 100644
--- a/app/Import/Routine/FinTSRoutine.php
+++ b/app/Import/Routine/FinTSRoutine.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FinTSRoutine.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php
index fa182515b1..88b9b8bdf3 100644
--- a/app/Import/Specifics/AbnAmroDescription.php
+++ b/app/Import/Specifics/AbnAmroDescription.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AbnAmroDescription.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 Robert Horlings
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/Specifics/Belfius.php b/app/Import/Specifics/Belfius.php
index c072fedeb2..626bf34a7f 100644
--- a/app/Import/Specifics/Belfius.php
+++ b/app/Import/Specifics/Belfius.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Belfius.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 Sander Kleykens <sander@kleykens.com>
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/Specifics/IngBelgium.php b/app/Import/Specifics/IngBelgium.php
index fcee30082c..eb7ffdaf14 100644
--- a/app/Import/Specifics/IngBelgium.php
+++ b/app/Import/Specifics/IngBelgium.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IngBelgium.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 Sander Kleykens <sander@kleykens.com>
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php
index f793dea909..7d554388ea 100644
--- a/app/Import/Specifics/IngDescription.php
+++ b/app/Import/Specifics/IngDescription.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IngDescription.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/tomwerf
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Import/Specifics/SnsDescription.php b/app/Import/Specifics/SnsDescription.php
index fc19e12e76..7eeb9bbcf6 100644
--- a/app/Import/Specifics/SnsDescription.php
+++ b/app/Import/Specifics/SnsDescription.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SnsDescription.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 hugovanduijn@gmail.com.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Services/Currency/RatesApiIOv1.php b/app/Services/Currency/RatesApiIOv1.php
index d67c434d37..f399b5f3ca 100644
--- a/app/Services/Currency/RatesApiIOv1.php
+++ b/app/Services/Currency/RatesApiIOv1.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RatesApiIOv1.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/BoGnY
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Support/FinTS/FinTS.php b/app/Support/FinTS/FinTS.php
index 28abb672eb..174032f488 100644
--- a/app/Support/FinTS/FinTS.php
+++ b/app/Support/FinTS/FinTS.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FinTS.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Support/FinTS/MetadataParser.php b/app/Support/FinTS/MetadataParser.php
index ab6eac660a..ea1155519b 100644
--- a/app/Support/FinTS/MetadataParser.php
+++ b/app/Support/FinTS/MetadataParser.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MetadataParser.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php b/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
index 58f00856d5..7356b0edac 100644
--- a/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
+++ b/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ChooseAccountHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php b/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php
index 205d2d78b2..ce48e854ef 100644
--- a/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FinTSConfigurationInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php b/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
index 882d39b260..91884c5fa6 100644
--- a/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
+++ b/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NewFinTSJobHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Support/Import/Routine/FinTS/StageImportDataHandler.php b/app/Support/Import/Routine/FinTS/StageImportDataHandler.php
index 9a67b5c56d..26997261fa 100644
--- a/app/Support/Import/Routine/FinTS/StageImportDataHandler.php
+++ b/app/Support/Import/Routine/FinTS/StageImportDataHandler.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StageImportDataHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 https://github.com/bnw
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/TransactionRules/Factory/ActionFactory.php b/app/TransactionRules/Factory/ActionFactory.php
index 8d2050700d..37a8acae7b 100644
--- a/app/TransactionRules/Factory/ActionFactory.php
+++ b/app/TransactionRules/Factory/ActionFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ActionFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 Robert Horlings
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/TransactionRules/Factory/TriggerFactory.php b/app/TransactionRules/Factory/TriggerFactory.php
index abeff803be..5289fae876 100644
--- a/app/TransactionRules/Factory/TriggerFactory.php
+++ b/app/TransactionRules/Factory/TriggerFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TriggerFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 Robert Horlings
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *