diff --git a/src/app/mandate.model.ts b/src/app/mandate.model.ts
index fcfa4de4a..714d089d9 100644
--- a/src/app/mandate.model.ts
+++ b/src/app/mandate.model.ts
@@ -3,7 +3,7 @@ export interface Mandate {
   campaignId: string,
   charityName: string,
   status: 'active'|'pending',
-  // @todo-regular-giving : we might want to keep the total donated amount as part of the regular giving mandate
+  // @todo-regular-giving-DON-1008 : we might want to keep the total donated amount as part of the regular giving mandate
   // giftAidAmount: number = 0;
   "schedule": {
     "type": "monthly",
@@ -11,21 +11,12 @@ export interface Mandate {
     "activeFrom": string,
     "expectedNextPaymentDate": string
   },
-  /**
-   * @todo-regular-giving: this property doesn't exist in matchbot yet
-   */
   numberOfMatchedDonations: number,
   giftAid: boolean,
-  /**
-   * @todo-regular-giving: this property needs renaming in matchbot
-   */
   donationAmount: {
     "amountInPence": number,
     "currency": "GBP"
   },
-  /**
-   * @todo-regular-giving: this property doesn't exist in matchbot yet
-   */
   matchedAmount: {
     "amountInPence": number,
     "currency": "GBP"
diff --git a/src/app/mandate/mandate.component.html b/src/app/mandate/mandate.component.html
index f3ebec6ca..2cc6c91d5 100644
--- a/src/app/mandate/mandate.component.html
+++ b/src/app/mandate/mandate.component.html
@@ -53,7 +53,7 @@ <h2>Thank you!</h2>
               <th scope="row">Matched Amount (for the first {{ mandate.numberOfMatchedDonations }} months)</th>
               <td>{{ mandate.matchedAmount.amountInPence / 100 | exactCurrency:mandate.donationAmount.currency }}</td>
             </tr>
-            <!--  @todo-regular-giving: consider displaying gift Aid and tip amount on the template (format copied from one-off cmpaign thank you page -->
+            <!--  @todo-regular-giving-DON-1008: consider displaying gift Aid and tip amount on the template (format copied from one-off cmpaign thank you page -->
             <!--                @if (giftAidAmount > 0) {-->
             <!--                  <tr>-->
             <!--                    <th scope="row">Gift Aid Amount</th>-->
@@ -65,7 +65,7 @@ <h2>Thank you!</h2>
                 <hr aria-hidden="true">
               </td>
             </tr>
-            <!--                @todo-regular-giving: use giftAid value sent from matchbot (possibly also the matched amounts calculations -->
+            <!--                @todo-regular-giving-DON-1008: use giftAid value sent from matchbot (possibly also the matched amounts calculations -->
             <tr class="receives">
               <th scope="row">Charity Receives (Matched Donations)</th>
               <td>{{ (mandate.donationAmount.amountInPence + mandate.matchedAmount.amountInPence) / 100 + ' ' | exactCurrency:mandate.donationAmount.currency }}</td>
diff --git a/src/app/regular-giving/regular-giving.component.html b/src/app/regular-giving/regular-giving.component.html
index dc474cdb6..398c2a7fb 100644
--- a/src/app/regular-giving/regular-giving.component.html
+++ b/src/app/regular-giving/regular-giving.component.html
@@ -77,18 +77,18 @@
             >
               <p> <!-- hack to take up space until I find a better way -->
 
-                <!-- @todo-regular-giving - make each or all payment detail fields read-only if already set on
+                <!-- @todo-regular-giving-DON-1021 - make each or all payment detail fields read-only if already set on
                      donor account - if donors want to edit them direct them to do so on the My Account page,
                      to make clear that it will affect existing mandates as well as the new one -->
 
                 @if (donorAccount.regularGivingPaymentMethod) {
-                  <!-- @todo-regular-giving: show existing payment method here, and/or on account page -->
+                  <!-- @todo-regular-giving-DON-1021: show existing payment method here, and/or on account page -->
                   <p style="border: 2px solid blue; background: pink">
                     Your existing regular giving payment method {{ donorAccount.regularGivingPaymentMethod }}
                     will be used for these donations.
                     To change this please visit your account page
 
-                    (todo-regular-giving: replace this paragraph with an element showing details of the saved method)
+                    (todo-regular-giving-DON-1021: replace this paragraph with an element showing details of the saved method)
                   </p>
                 } @else {
                   <biggive-text-input>
@@ -168,7 +168,7 @@
                   <mat-icon class="b-va-bottom" aria-hidden="false" aria-label="Open in new tab">open_in_new</mat-icon>
                   read our Privacy Statement.</a>
               </p>
-              <p>(todo-regular-giving: add link to regular giving terms & conditions)</p>
+              <p>(todo-regular-giving-OPS-766: add link to regular giving terms & conditions)</p>
 
               @if (submitErrorMessage) {
                 <div