diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php
index 1314983f16..dbe49283bf 100644
--- a/app/Api/V1/Controllers/Chart/CategoryController.php
+++ b/app/Api/V1/Controllers/Chart/CategoryController.php
@@ -65,7 +65,7 @@ class CategoryController extends Controller
      *
      * @return JsonResponse
      *
-     * TODO after 4.8.0, simplify
+     * TODO after 4.8,0, simplify
      */
     public function overview(DateRequest $request): JsonResponse
     {
diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php
index a8c86c00f3..dba2b93e7b 100644
--- a/app/Api/V1/Requests/BillRequest.php
+++ b/app/Api/V1/Requests/BillRequest.php
@@ -30,7 +30,7 @@ use Illuminate\Validation\Validator;
 /**
  * Class BillRequest
  *
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  *
  * @codeCoverageIgnore
  */
diff --git a/app/Api/V1/Requests/BudgetLimitRequest.php b/app/Api/V1/Requests/BudgetLimitRequest.php
index b69e52d0e4..d439d83d8d 100644
--- a/app/Api/V1/Requests/BudgetLimitRequest.php
+++ b/app/Api/V1/Requests/BudgetLimitRequest.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Requests;
  * Class BudgetLimitRequest
  *
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class BudgetLimitRequest extends Request
 {
diff --git a/app/Api/V1/Requests/BudgetRequest.php b/app/Api/V1/Requests/BudgetRequest.php
index 15ac238b3e..b74c955c1c 100644
--- a/app/Api/V1/Requests/BudgetRequest.php
+++ b/app/Api/V1/Requests/BudgetRequest.php
@@ -29,7 +29,7 @@ use FireflyIII\Rules\IsBoolean;
 /**
  * Class BudgetRequest
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class BudgetRequest extends Request
 {
diff --git a/app/Api/V1/Requests/CategoryRequest.php b/app/Api/V1/Requests/CategoryRequest.php
index 85e82ed124..7eee63d07f 100644
--- a/app/Api/V1/Requests/CategoryRequest.php
+++ b/app/Api/V1/Requests/CategoryRequest.php
@@ -28,7 +28,7 @@ use FireflyIII\Models\Category;
 /**
  * Class CategoryRequest
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class CategoryRequest extends Request
 {
diff --git a/app/Api/V1/Requests/CurrencyRequest.php b/app/Api/V1/Requests/CurrencyRequest.php
index 7db6f10265..a109ab37b8 100644
--- a/app/Api/V1/Requests/CurrencyRequest.php
+++ b/app/Api/V1/Requests/CurrencyRequest.php
@@ -29,7 +29,7 @@ use FireflyIII\Rules\IsBoolean;
 /**
  * Class CurrencyRequest
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class CurrencyRequest extends Request
 {
diff --git a/app/Api/V1/Requests/LinkTypeRequest.php b/app/Api/V1/Requests/LinkTypeRequest.php
index 598db93461..c1f5a8f878 100644
--- a/app/Api/V1/Requests/LinkTypeRequest.php
+++ b/app/Api/V1/Requests/LinkTypeRequest.php
@@ -30,7 +30,7 @@ use Illuminate\Validation\Rule;
  *
  * Class LinkTypeRequest
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class LinkTypeRequest extends Request
 {
diff --git a/app/Api/V1/Requests/PiggyBankRequest.php b/app/Api/V1/Requests/PiggyBankRequest.php
index 1ab6a9b396..e3c8ea655a 100644
--- a/app/Api/V1/Requests/PiggyBankRequest.php
+++ b/app/Api/V1/Requests/PiggyBankRequest.php
@@ -31,7 +31,7 @@ use FireflyIII\Rules\ZeroOrMore;
  *
  * Class PiggyBankRequest
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class PiggyBankRequest extends Request
 {
diff --git a/app/Api/V1/Requests/RuleGroupRequest.php b/app/Api/V1/Requests/RuleGroupRequest.php
index 1b1760a893..e2e06938c6 100644
--- a/app/Api/V1/Requests/RuleGroupRequest.php
+++ b/app/Api/V1/Requests/RuleGroupRequest.php
@@ -30,7 +30,7 @@ use FireflyIII\Rules\IsBoolean;
 /**
  * @codeCoverageIgnore
  * Class RuleGroupRequest
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class RuleGroupRequest extends Request
 {
diff --git a/app/Api/V1/Requests/TagRequest.php b/app/Api/V1/Requests/TagRequest.php
index e463dc72de..971f7e7125 100644
--- a/app/Api/V1/Requests/TagRequest.php
+++ b/app/Api/V1/Requests/TagRequest.php
@@ -31,7 +31,7 @@ use FireflyIII\Models\Tag;
  *
  * @codeCoverageIgnore
  *
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class TagRequest extends Request
 {
diff --git a/app/Api/V1/Requests/UserRequest.php b/app/Api/V1/Requests/UserRequest.php
index 4cb67c73b3..58fb6ae474 100644
--- a/app/Api/V1/Requests/UserRequest.php
+++ b/app/Api/V1/Requests/UserRequest.php
@@ -32,7 +32,7 @@ use FireflyIII\User;
 /**
  * Class UserRequest
  * @codeCoverageIgnore
- * TODO AFTER 4.8.0: split this into two request classes.
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class UserRequest extends Request
 {
diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php
index 9910177ee9..03ee0fed19 100644
--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@@ -253,7 +253,7 @@ class TransactionJournalFactory
         }
         // @codeCoverageIgnoreEnd
 
-        // TODO After 4.8.0 better handling below:
+        // TODO AFTER 4.8,0 better handling below:
 
         /** double check currencies. */
         $sourceCurrency        = $currency;
diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php
index 937704396f..089ece20af 100644
--- a/app/Http/Requests/BudgetFormRequest.php
+++ b/app/Http/Requests/BudgetFormRequest.php
@@ -28,7 +28,7 @@ use FireflyIII\Models\Budget;
  * Class BudgetFormRequest.
  *
  * @codeCoverageIgnore
- * TODO after 4.8.0, split for update/store
+ * TODO AFTER 4.8,0, split for update/store
  */
 class BudgetFormRequest extends Request
 {
diff --git a/app/Repositories/Journal/JournalCLIRepository.php b/app/Repositories/Journal/JournalCLIRepository.php
index 53e9103ba8..9b3452625d 100644
--- a/app/Repositories/Journal/JournalCLIRepository.php
+++ b/app/Repositories/Journal/JournalCLIRepository.php
@@ -229,7 +229,7 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface
 
     /**
      * Returns all journals with more than 2 transactions. Should only return empty collections
-     * in Firefly III > v4.8.0.
+     * in Firefly III > v4.8,0.
      *
      * @return Collection
      */
diff --git a/app/Repositories/Journal/JournalCLIRepositoryInterface.php b/app/Repositories/Journal/JournalCLIRepositoryInterface.php
index c506fc2a08..34ffc7852b 100644
--- a/app/Repositories/Journal/JournalCLIRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalCLIRepositoryInterface.php
@@ -47,7 +47,7 @@ interface JournalCLIRepositoryInterface
 
     /**
      * Returns all journals with more than 2 transactions. Should only return empty collections
-     * in Firefly III > v4.8.0.
+     * in Firefly III > v4.8,0.
      *
      * @return Collection
      */
diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php
index 8ac858a7b8..68fe9fe49b 100644
--- a/app/Repositories/Journal/JournalRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalRepositoryInterface.php
@@ -90,7 +90,7 @@ interface JournalRepositoryInterface
     public function firstNull(): ?TransactionJournal;
 
     /**
-     * TODO this method is no longer well-fitted in 4.8.0. Should be refactored and/or removed.
+     * TODO this method is no longer well-fitted in 4.8,0. Should be refactored and/or removed.
      * Return a list of all destination accounts related to journal.
      *
      * @param TransactionJournal $journal
@@ -100,7 +100,7 @@ interface JournalRepositoryInterface
     public function getJournalDestinationAccounts(TransactionJournal $journal): Collection;
 
     /**
-     * TODO this method is no longer well-fitted in 4.8.0. Should be refactored and/or removed.
+     * TODO this method is no longer well-fitted in 4.8,0. Should be refactored and/or removed.
      * Return a list of all source accounts related to journal.
      *
      * @param TransactionJournal $journal