diff --git a/src/app/cln/graph/lookups/channel-lookup/channel-lookup.component.html b/src/app/cln/graph/lookups/channel-lookup/channel-lookup.component.html
index aaf8424a..49471a05 100644
--- a/src/app/cln/graph/lookups/channel-lookup/channel-lookup.component.html
+++ b/src/app/cln/graph/lookups/channel-lookup/channel-lookup.component.html
@@ -8,7 +8,7 @@
       </div>
       <mat-divider [inset]="true"></mat-divider>
       <div fxLayout="column" fxFlex="20" class="my-1">
-        <h4 class="font-bold-500">Short Channel Id</h4>
+        <h4 class="font-bold-500">Short Channel ID</h4>
         <span class="foreground-secondary-text">{{lookupResult[0]?.short_channel_id}}</span>
       </div>
       <mat-divider [inset]="true"></mat-divider>
@@ -89,7 +89,7 @@
       </div>
       <mat-divider [inset]="true"></mat-divider>
       <div fxLayout="column" fxFlex="20" class="my-1">
-        <h4 class="font-bold-500">Short Channel Id</h4>
+        <h4 class="font-bold-500">Short Channel ID</h4>
         <span class="foreground-secondary-text">{{lookupResult[1]?.short_channel_id}}</span>
       </div>
       <mat-divider [inset]="true"></mat-divider>
diff --git a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html
index 8198b0c9..f336e558 100644
--- a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html
+++ b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html
@@ -76,7 +76,7 @@
               </td>
             </ng-container>
             <ng-container matColumnDef="nodeid">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header> Node Id </th>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header> Node ID </th>
               <td mat-cell *matCellDef="let lqNode">
                 <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
                   <span class="ellipsis-child">{{lqNode?.nodeid}}</span>
diff --git a/src/app/cln/peers-channels/channels/channel-information-modal/channel-information.component.html b/src/app/cln/peers-channels/channels/channel-information-modal/channel-information.component.html
index 511b4bb0..0947aa1e 100644
--- a/src/app/cln/peers-channels/channels/channel-information-modal/channel-information.component.html
+++ b/src/app/cln/peers-channels/channels/channel-information-modal/channel-information.component.html
@@ -75,7 +75,7 @@
         <div *ngIf="showAdvanced">
           <div fxLayout="row">
             <div fxFlex="100">
-              <h4 fxLayoutAlign="start" class="font-bold-500">Funding Transaction Id</h4>
+              <h4 fxLayoutAlign="start" class="font-bold-500">Funding Transaction ID</h4>
               <span class="foreground-secondary-text">{{channel.funding_txid}}</span>
             </div>
           </div>
diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
index 5321f19b..16353462 100644
--- a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
+++ b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
@@ -32,7 +32,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.id}}</span>
@@ -40,7 +40,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="channel_id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.channel_id}}</span>
@@ -48,7 +48,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="funding_txid">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Funding Transaction Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Funding Transaction ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.funding_txid}}</span>
diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
index 8dca2525..b54659b2 100644
--- a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
+++ b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
@@ -24,7 +24,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.id}}</span>
@@ -32,7 +32,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="channel_id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.channel_id}}</span>
@@ -40,7 +40,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="funding_txid">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Funding Transaction Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Funding Transaction ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.funding_txid}}</span>
diff --git a/src/app/cln/routing/failed-transactions/failed-transactions.component.html b/src/app/cln/routing/failed-transactions/failed-transactions.component.html
index 6e3f7950..830776bc 100644
--- a/src/app/cln/routing/failed-transactions/failed-transactions.component.html
+++ b/src/app/cln/routing/failed-transactions/failed-transactions.component.html
@@ -24,7 +24,7 @@
         <td mat-cell *matCellDef="let fhEvent">{{(fhEvent?.resolved_time * 1000) | date:'dd/MMM/y HH:mm'}}</td>
       </ng-container>
       <ng-container matColumnDef="in_channel">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.in_channel}}</td>
       </ng-container>
       <ng-container matColumnDef="in_channel_alias">
@@ -36,7 +36,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="out_channel">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.out_channel}}</td>
       </ng-container>      
       <ng-container matColumnDef="out_channel_alias">
diff --git a/src/app/cln/routing/forwarding-history/forwarding-history.component.html b/src/app/cln/routing/forwarding-history/forwarding-history.component.html
index 9b7398f0..931400fd 100644
--- a/src/app/cln/routing/forwarding-history/forwarding-history.component.html
+++ b/src/app/cln/routing/forwarding-history/forwarding-history.component.html
@@ -18,7 +18,7 @@
         <td mat-cell *matCellDef="let fhEvent">{{(fhEvent?.resolved_time * 1000) | date:'dd/MMM/y HH:mm'}}</td>
       </ng-container>
       <ng-container matColumnDef="in_channel">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.in_channel}}</td>
       </ng-container>
       <ng-container matColumnDef="in_channel_alias">
@@ -30,7 +30,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="out_channel">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.out_channel}}</td>
       </ng-container>
       <ng-container matColumnDef="out_channel_alias">
diff --git a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html
index a3583835..227e6228 100644
--- a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html
+++ b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html
@@ -20,7 +20,7 @@
         <td mat-cell *matCellDef="let fhEvent">{{(fhEvent?.received_time * 1000) | date:'dd/MMM/y HH:mm'}}</td>
       </ng-container>
       <ng-container matColumnDef="in_channel">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.in_channel}}</td>
       </ng-container>
       <ng-container matColumnDef="in_channel_alias">
@@ -32,7 +32,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="out_channel">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.out_channel}}</td>
       </ng-container>
       <ng-container matColumnDef="out_channel_alias">
diff --git a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html
index 08c8c951..2c3fe66b 100644
--- a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html
+++ b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html
@@ -25,10 +25,6 @@
             </div>
           </td>
         </ng-container>
-        <ng-container matColumnDef="amountMSat">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Amount (Sats) </th>
-          <td mat-cell *matCellDef="let offersbookmark"><span fxLayoutAlign="end center">{{(offersbookmark.amountMSat === 0) ? 'Open' : (offersbookmark.amountMSat / 1000) | number}}</span></td>
-        </ng-container>
         <ng-container matColumnDef="description">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Description </th>
           <td mat-cell *matCellDef="let offersbookmark">
@@ -49,6 +45,10 @@
             </div>
           </td>
         </ng-container>
+        <ng-container matColumnDef="amountMSat">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Amount (Sats) </th>
+          <td mat-cell *matCellDef="let offersbookmark"><span fxLayoutAlign="end center">{{(offersbookmark.amountMSat === 0) ? 'Open' : (offersbookmark.amountMSat / 1000) | number}}</span></td>
+        </ng-container>
         <ng-container matColumnDef="actions">
           <th mat-header-cell *matHeaderCellDef>
             <div class="bordered-box table-actions-select" fxLayoutAlign="center center">
diff --git a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html
index cb5936ea..8d8c118e 100644
--- a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html
+++ b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html
@@ -34,7 +34,7 @@
           </td>
         </ng-container>
         <ng-container matColumnDef="txid">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Transaction Id </th>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Transaction ID </th>
           <td mat-cell *matCellDef="let transaction">
             <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
               <span class="ellipsis-child">{{transaction?.txid}}</span>
diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html
index 7711f936..70c6a330 100644
--- a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html
+++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html
@@ -24,7 +24,7 @@
         <td mat-cell *matCellDef="let channel">{{channel?.shortChannelId}}</td>
       </ng-container>
       <ng-container matColumnDef="channelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.channelId}}</span>
@@ -40,7 +40,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="nodeId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Node Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Node ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.nodeId}}</span>
diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
index 05b87901..78db0537 100644
--- a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
+++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
@@ -20,7 +20,7 @@
         <td mat-cell *matCellDef="let channel">{{channel?.shortChannelId}}</td>
       </ng-container>
       <ng-container matColumnDef="channelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.channelId}}</span>
@@ -36,7 +36,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="nodeId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Node Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Node ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.nodeId}}</span>
diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
index 3f489630..a704f24e 100644
--- a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
+++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
@@ -20,7 +20,7 @@
         <td mat-cell *matCellDef="let channel"> {{channel?.state | titlecase}}</td>
       </ng-container>
       <ng-container matColumnDef="channelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.channelId}}</span>
@@ -32,7 +32,7 @@
         <td mat-cell *matCellDef="let channel">{{channel?.alias}}</td>
       </ng-container>
       <ng-container matColumnDef="nodeId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Node Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Node ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.nodeId}}</span>
diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.html b/src/app/eclair/routing/forwarding-history/forwarding-history.component.html
index 3dd129ef..e4977d92 100644
--- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.html
+++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.html
@@ -22,7 +22,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="fromChannelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{fhEvent?.fromChannelId}}</span>
@@ -30,7 +30,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="fromShortChannelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel Short Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>In Channel Short ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.fromShortChannelId}}</td>
       </ng-container>
       <ng-container matColumnDef="fromChannelAlias">
@@ -42,7 +42,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="toChannelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel ID</th>
         <td mat-cell *matCellDef="let fhEvent">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{fhEvent?.toChannelId}}</span>
@@ -50,7 +50,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="toShortChannelId">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel Short Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Out Channel Short ID</th>
         <td mat-cell *matCellDef="let fhEvent">{{fhEvent?.toShortChannelId}}</td>
       </ng-container>
       <ng-container matColumnDef="toChannelAlias">
diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts b/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts
index a5736a95..2f76e0e1 100644
--- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts
+++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts
@@ -117,10 +117,10 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi
       { key: 'amountOut', value: selFEvent.amountOut, title: 'Amount Out (Sats)', width: 50, type: DataTypeEnum.NUMBER }],
       [{ key: 'fromChannelAlias', value: selFEvent.fromChannelAlias, title: 'From Channel Alias', width: 50, type: DataTypeEnum.STRING },
       { key: 'fromShortChannelId', value: selFEvent.fromShortChannelId, title: 'From Short Channel ID', width: 50, type: DataTypeEnum.STRING }],
-      [{ key: 'fromChannelId', value: selFEvent.fromChannelId, title: 'From Channel Id', width: 100, type: DataTypeEnum.STRING }],
+      [{ key: 'fromChannelId', value: selFEvent.fromChannelId, title: 'From Channel ID', width: 100, type: DataTypeEnum.STRING }],
       [{ key: 'toChannelAlias', value: selFEvent.toChannelAlias, title: 'To Channel Alias', width: 50, type: DataTypeEnum.STRING },
       { key: 'toShortChannelId', value: selFEvent.toShortChannelId, title: 'To Short Channel ID', width: 50, type: DataTypeEnum.STRING }],
-      [{ key: 'toChannelId', value: selFEvent.toChannelId, title: 'To Channel Id', width: 100, type: DataTypeEnum.STRING }]
+      [{ key: 'toChannelId', value: selFEvent.toChannelId, title: 'To Channel ID', width: 100, type: DataTypeEnum.STRING }]
     ];
     if (selFEvent.type !== 'payment-relayed') {
       reorderedFHEvent?.unshift([{ key: 'type', value: this.commonService.camelCase(selFEvent.type), title: 'Relay Type', width: 100, type: DataTypeEnum.STRING }]);
diff --git a/src/app/eclair/transactions/invoice-information-modal/invoice-information.component.html b/src/app/eclair/transactions/invoice-information-modal/invoice-information.component.html
index 48cf6131..c0660025 100644
--- a/src/app/eclair/transactions/invoice-information-modal/invoice-information.component.html
+++ b/src/app/eclair/transactions/invoice-information-modal/invoice-information.component.html
@@ -89,7 +89,7 @@
           <mat-divider class="w-100 my-1"></mat-divider>
           <div fxLayout="row">
             <div fxFlex="100">
-              <h4 fxLayoutAlign="start" class="font-bold-500">Node Id</h4>
+              <h4 fxLayoutAlign="start" class="font-bold-500">Node ID</h4>
               <span class="overflow-wrap foreground-secondary-text">{{invoice?.nodeId}}</span>
             </div>
           </div>
diff --git a/src/app/eclair/transactions/invoices/lightning-invoices.component.html b/src/app/eclair/transactions/invoices/lightning-invoices.component.html
index d42d874b..6d6bc136 100644
--- a/src/app/eclair/transactions/invoices/lightning-invoices.component.html
+++ b/src/app/eclair/transactions/invoices/lightning-invoices.component.html
@@ -51,7 +51,7 @@
           <td mat-cell *matCellDef="let invoice">{{((invoice?.receivedAt * 1000) | date:'dd/MMM/y HH:mm') || '-'}}</td>
         </ng-container>
         <ng-container matColumnDef="nodeId">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Node Id </th>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Node ID </th>
           <td mat-cell *matCellDef="let invoice">
             <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
               <span class="ellipsis-child">{{invoice?.nodeId}}</span>
diff --git a/src/app/eclair/transactions/payments/lightning-payments.component.html b/src/app/eclair/transactions/payments/lightning-payments.component.html
index b683bb04..bf5396b5 100644
--- a/src/app/eclair/transactions/payments/lightning-payments.component.html
+++ b/src/app/eclair/transactions/payments/lightning-payments.component.html
@@ -40,7 +40,7 @@
             </td>
           </ng-container>
           <ng-container matColumnDef="recipientNodeId">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header>Destination Node Id</th>
+            <th mat-header-cell *matHeaderCellDef mat-sort-header>Destination Node ID</th>
             <td mat-cell *matCellDef="let payment">
               <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
                 <span class="ellipsis-child">{{payment?.recipientNodeId}}</span>
diff --git a/src/app/lnd/graph/lookups/channel-lookup/channel-lookup.component.html b/src/app/lnd/graph/lookups/channel-lookup/channel-lookup.component.html
index 780f1936..d2857402 100644
--- a/src/app/lnd/graph/lookups/channel-lookup/channel-lookup.component.html
+++ b/src/app/lnd/graph/lookups/channel-lookup/channel-lookup.component.html
@@ -2,7 +2,7 @@
   <mat-divider [inset]="true" class="mb-1"></mat-divider>
   <div fxLayout="row">
     <div fxLayout="column" fxFlex="30" fxLayoutAlign="end start">
-      <h4 class="font-bold-500">Channel Id</h4>
+      <h4 class="font-bold-500">Channel ID</h4>
       <span class="foreground-secondary-text">{{lookupResult.channel_id}}</span>
     </div>
     <div fxLayout="column" fxFlex="70" fxLayoutAlign="end start">
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html
index e35e535b..f71d81da 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html
@@ -42,7 +42,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="chan_id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel ID </th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel?.chan_id}}</span>
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
index ac115840..5458b9fb 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html
@@ -47,7 +47,7 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="chan_id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Channel Id</th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Channel ID</th>
         <td mat-cell *matCellDef="let channel">
           <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
             <span class="ellipsis-child">{{channel.chan_id}}</span>
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
index 94e8e423..e635ca9d 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html
@@ -104,7 +104,7 @@
       <div [perfectScrollbar] fxLayout="column" fxLayoutAlign="start center" fxFlex="100" class="table-container">
         <table mat-table #table [dataSource]="pendingForceClosingChannels" matSort [ngClass]="{'error-border bordered-box': errorMessage !== '','bordered-box': true}">
           <ng-container matColumnDef="closing_txid">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header> Closing Tx Id </th>
+            <th mat-header-cell *matHeaderCellDef mat-sort-header> Closing Tx ID </th>
             <td mat-cell *matCellDef="let channel">
               <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
                 <span class="ellipsis-child">{{channel.closing_txid}}</span>
@@ -200,7 +200,7 @@
       <div [perfectScrollbar] fxLayout="column" fxLayoutAlign="start center" fxFlex="100" class="table-container">
         <table mat-table #table [dataSource]="pendingClosingChannels" matSort [ngClass]="{'error-border bordered-box': errorMessage !== '','bordered-box': true}">
           <ng-container matColumnDef="closing_txid">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header> Closing Tx Id </th>
+            <th mat-header-cell *matHeaderCellDef mat-sort-header> Closing Tx ID </th>
             <td mat-cell *matCellDef="let channel">
               <div class="ellipsis-parent" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : colWidth}">
                 <span class="ellipsis-child">{{channel.closing_txid}}</span>
diff --git a/src/app/shared/services/consts-enums-functions.ts b/src/app/shared/services/consts-enums-functions.ts
index f6706e48..dc3c781e 100644
--- a/src/app/shared/services/consts-enums-functions.ts
+++ b/src/app/shared/services/consts-enums-functions.ts
@@ -758,88 +758,88 @@ export const CLN_PAGE_DEFS: CLNPageDefinitions = {
   on_chain: {
     utxos: {
       maxColumns: 7,
-      allowedColumns: [{ column:'txid' }, { column:'address' }, { column:'scriptpubkey' }, { column:'output' }, { column:'value' }, { column:'blockheight' },
+      allowedColumns: [{ column:'txid', label: 'Transaction ID' }, { column:'address' }, { column:'scriptpubkey', label: 'Script Pubkey' }, { column:'output' }, { column:'value' }, { column:'blockheight' },
       { column:'reserved' }]
     },
     dust_utxos: {
       maxColumns: 7,
-      allowedColumns: [{ column:'txid' }, { column:'address' }, { column:'scriptpubkey' }, { column:'output' }, { column:'value' }, { column:'blockheight' },
+      allowedColumns: [{ column:'txid', label: 'Transaction ID' }, { column:'address' }, { column:'scriptpubkey', label: 'Script Pubkey' }, { column:'output' }, { column:'value' }, { column:'blockheight' },
       { column:'reserved' }]
     }
   },
   peers_channels: {
     open_channels: {
       maxColumns: 8,
-      allowedColumns: [{ column:'short_channel_id' }, { column:'alias' }, { column:'id' }, { column:'channel_id' }, { column:'funding_txid' },
-      { column:'connected' }, { column:'our_channel_reserve_satoshis' }, { column:'their_channel_reserve_satoshis' }, { column:'msatoshi_total' },
-      { column:'spendable_msatoshi' }, { column:'msatoshi_to_us' }, { column:'msatoshi_to_them' }, { column:'balancedness', label: 'Balance Score' }]
+      allowedColumns: [{ column:'short_channel_id' }, { column:'alias' }, { column:'id' }, { column:'channel_id' }, { column:'funding_txid', label: 'Funding Transaction ID' },
+      { column:'connected' }, { column:'our_channel_reserve_satoshis', label: 'Local Reserve' }, { column:'their_channel_reserve_satoshis', label: 'Remote Reserve' }, { column:'msatoshi_total', label: 'Total' },
+      { column:'spendable_msatoshi', label: 'Spendable' }, { column:'msatoshi_to_us', label: 'Local Balance' }, { column:'msatoshi_to_them', label: 'Remote Balance' }, { column:'balancedness', label: 'Balance Score' }]
     },
     pending_inactive_channels: {
       maxColumns: 8,
-      allowedColumns: [{ column:'alias' }, { column:'id' }, { column:'channel_id' }, { column:'funding_txid' }, { column:'connected' }, { column:'state' },
-      { column:'our_channel_reserve_satoshis' }, { column:'their_channel_reserve_satoshis' }, { column:'msatoshi_total' }, { column:'spendable_msatoshi' },
-      { column:'msatoshi_to_us' }, { column:'msatoshi_to_them' }]
+      allowedColumns: [{ column:'alias' }, { column:'id' }, { column:'channel_id' }, { column:'funding_txid', label: 'Funding Transaction ID' }, { column:'connected' }, { column:'state' },
+      { column:'our_channel_reserve_satoshis', label: 'Local Reserve' }, { column:'their_channel_reserve_satoshis', label: 'Remote Reserve' }, { column:'msatoshi_total', label: 'Total' }, { column:'spendable_msatoshi', label: 'Spendable' },
+      { column:'msatoshi_to_us', label: 'Local Balance' }, { column:'msatoshi_to_them', label: 'Remote Balance' }]
     },
     peers: {
       maxColumns: 3,
-      allowedColumns: [{ column:'alias' }, { column:'id' }, { column:'netaddr' }]
+      allowedColumns: [{ column:'alias' }, { column:'id' }, { column:'netaddr', label: 'Network Address' }]
     }
   },
   liquidity_ads: {
     liquidity_ads: {
       maxColumns: 8,
-      allowedColumns: [{ column:'alias' }, { column:'nodeid' }, { column:'last_timestamp' }, { column:'compact_lease' }, { column:'lease_fee' },
+      allowedColumns: [{ column:'alias' }, { column:'nodeid', label: 'Node ID' }, { column:'last_timestamp', label: 'Last Announcement At' }, { column:'compact_lease' }, { column:'lease_fee' },
       { column:'routing_fee' }, { column:'channel_opening_fee' }, { column:'funding_weight' }]
     }
   },
   transactions: {
     payments: {
       maxColumns: 7,
-      allowedColumns: [{ column:'created_at' }, { column:'type' }, { column:'payment_hash' }, { column:'bolt11' }, { column:'destination' }, { column:'memo' },
-      { column:'label' }, { column:'msatoshi_sent' }, { column:'msatoshi' }]
+      allowedColumns: [{ column:'created_at', label: 'Created At' }, { column:'type' }, { column:'payment_hash' }, { column:'bolt11', label: 'Invoice' }, { column:'destination' }, { column:'memo' },
+      { column:'label' }, { column:'msatoshi_sent', label: 'Sats Sent' }, { column:'msatoshi', label: 'Sats Received' }]
     },
     invoices: {
       maxColumns: 7,
-      allowedColumns: [{ column:'expires_at' }, { column:'paid_at' }, { column:'type' }, { column:'description' }, { column:'label' },
-      { column:'payment_hash' }, { column:'bolt11' }, { column:'msatoshi' }, { column:'msatoshi_received' }]
+      allowedColumns: [{ column:'expires_at', label: 'Expiry Date' }, { column:'paid_at', label: 'Date Settled' }, { column:'type' }, { column:'description' }, { column:'label' },
+      { column:'payment_hash' }, { column:'bolt11', label: 'Invoice' }, { column:'msatoshi', label: 'Amount' }, { column:'msatoshi_received', label: 'Amount Settled' }]
     },
     offers: {
       maxColumns: 4,
-      allowedColumns: [{ column:'offer_id' }, { column:'single_use' }, { column:'used' }, { column:'bolt12' }]
+      allowedColumns: [{ column:'offer_id', label: 'Offer ID' }, { column:'single_use' }, { column:'used' }, { column:'bolt12', label: 'Invoice' }]
     },
     offer_bookmarks: {
       maxColumns: 6,
-      allowedColumns: [{ column:'lastUpdatedAt' }, { column:'title' }, { column:'description' }, { column:'vendor' }, { column:'bolt12' },
-      { column:'amountMSat' }]
+      allowedColumns: [{ column:'lastUpdatedAt', label: 'Updated At' }, { column:'title' }, { column:'description' }, { column:'vendor' }, { column:'bolt12', label: 'Invoice' },
+      { column:'amountMSat', label: 'Amount' }]
     }
   },
   routing: {
     forwarding_history: {
       maxColumns: 8,
-      allowedColumns: [{ column:'received_time' }, { column:'resolved_time' }, { column:'in_channel' }, { column:'in_channel_alias' },
-      { column:'out_channel' }, { column:'out_channel_alias' }, { column:'payment_hash' }, { column:'in_msatoshi' }, { column:'out_msatoshi' },
+      allowedColumns: [{ column:'received_time' }, { column:'resolved_time' }, { column:'in_channel', label: 'In Channel ID' }, { column:'in_channel_alias', label: 'In Channel' },
+      { column:'out_channel', label: 'Out Channel ID' }, { column:'out_channel_alias', label: 'Out Channel' }, { column:'payment_hash' }, { column:'in_msatoshi', label: 'Amount In' }, { column:'out_msatoshi', label: 'Amount Out' },
       { column:'fee' }]
     },
     routing_peers: {
       maxColumns: 5,
-      allowedColumns: [{ column:'channel_id' }, { column:'alias' }, { column:'events' }, { column:'total_amount' }, { column:'total_fee' }]
+      allowedColumns: [{ column:'channel_id' }, { column:'alias', label: 'Peer Alias' }, { column:'events' }, { column:'total_amount', label: 'Amount' }, { column:'total_fee', label: 'Fee' }]
     },
     failed: {
       maxColumns: 7,
-      allowedColumns: [{ column:'received_time' }, { column:'resolved_time' }, { column:'in_channel' }, { column:'in_channel_alias' },
-      { column:'out_channel' }, { column:'out_channel_alias' }, { column:'in_msatoshi' }, { column:'out_msatoshi' }, { column:'fee' }]
+      allowedColumns: [{ column:'received_time' }, { column:'resolved_time' }, { column:'in_channel', label: 'In Channel ID' }, { column:'in_channel_alias', label: 'In Channel' },
+      { column:'out_channel', label: 'Out Channel ID' }, { column:'out_channel_alias', label: 'Out Channel' }, { column:'in_msatoshi', label: 'Amount In' }, { column:'out_msatoshi', label: 'Amount Out' }, { column:'fee' }]
     },
     local_failed: {
       maxColumns: 6,
-      allowedColumns: [{ column:'received_time' }, { column:'in_channel' }, { column:'in_channel_alias' }, { column:'out_channel' },
-      { column:'out_channel_alias' }, { column:'in_msatoshi' }, { column:'style' }, { column:'failreason' }]
+      allowedColumns: [{ column:'received_time' }, { column:'in_channel', label: 'In Channel ID' }, { column:'in_channel_alias', label: 'In Channel' }, { column:'out_channel', label: 'Out Channel ID' },
+      { column:'out_channel_alias', label: 'Out Channel' }, { column:'in_msatoshi', label: 'Amount In' }, { column:'style' }, { column:'failreason', label: 'Fail Reason' }]
     }
   },
   reports: {
     routing: {
       maxColumns: 8,
-      allowedColumns: [{ column:'received_time' }, { column:'resolved_time' }, { column:'in_channel' }, { column:'in_channel_alias' },
-      { column:'out_channel' }, { column:'out_channel_alias' }, { column:'payment_hash' }, { column:'in_msatoshi' }, { column:'out_msatoshi' },
+      allowedColumns: [{ column:'received_time' }, { column:'resolved_time' }, { column:'in_channel', label: 'In Channel ID' }, { column:'in_channel_alias', label: 'In Channel' },
+      { column:'out_channel', label: 'Out Channel ID' }, { column:'out_channel_alias', label: 'Out Channel' }, { column:'payment_hash' }, { column:'in_msatoshi', label: 'Amount In' }, { column:'out_msatoshi', label: 'Amount Out' },
       { column:'fee' }]
     },
     transactions: {
@@ -850,7 +850,7 @@ export const CLN_PAGE_DEFS: CLNPageDefinitions = {
   graph_lookup: {
     query_routes: {
       maxColumns: 6,
-      allowedColumns: [{ column:'id' }, { column:'alias' }, { column:'channel' }, { column:'direction' }, { column:'delay' }, { column:'msatoshi' }]
+      allowedColumns: [{ column:'id' }, { column:'alias' }, { column:'channel' }, { column:'direction' }, { column:'delay' }, { column:'msatoshi', label: 'Amount' }]
     }
   },
   peerswap: {
@@ -967,7 +967,7 @@ export const LND_PAGE_DEFS: LNDPageDefinitions = {
   peers_channels: {
     open: {
       maxColumns: 8,
-      allowedColumns: [{ column:'remote_alias', label: 'Peer' }, { column:'remote_pubkey', label: 'Pubkey' }, { column:'channel_point' }, { column:'chan_id', label: 'Channel Id' }, { column:'initiator' },
+      allowedColumns: [{ column:'remote_alias', label: 'Peer' }, { column:'remote_pubkey', label: 'Pubkey' }, { column:'channel_point' }, { column:'chan_id', label: 'Channel ID' }, { column:'initiator' },
       { column:'static_remote_key' }, { column:'uptime' }, { column:'lifetime' }, { column:'commit_fee' }, { column:'commit_weight' }, { column:'fee_per_kw', label: 'Fee/KW' },
       { column:'num_updates', label: 'Updates' }, { column:'unsettled_balance' }, { column:'capacity' }, { column:'local_chan_reserve_sat', label: 'Local Reserve' },
       { column:'remote_chan_reserve_sat', label: 'Remote Reserve' }, { column:'total_satoshis_sent', label: 'Sats Sent' }, { column:'total_satoshis_received', label: 'Sats Received' }, { column:'local_balance' },
@@ -983,25 +983,25 @@ export const LND_PAGE_DEFS: LNDPageDefinitions = {
     pending_force_closing: {
       maxColumns: 7,
       disablePageSize: true,
-      allowedColumns: [{ column:'closing_txid', label: 'Closing Tx Id' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_node_pub', label: 'Pubkey' }, { column:'channel_point' }, { column:'initiator' },
+      allowedColumns: [{ column:'closing_txid', label: 'Closing Tx ID' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_node_pub', label: 'Pubkey' }, { column:'channel_point' }, { column:'initiator' },
       { column:'commitment_type' }, { column:'limbo_balance' }, { column:'maturity_height' }, { column:'blocks_til_maturity', label: 'Blocks till Maturity' }, { column:'recovered_balance' },
       { column:'capacity' }, { column:'local_balance' }, { column:'remote_balance' }]
     },
     pending_closing: {
       maxColumns: 7,
       disablePageSize: true,
-      allowedColumns: [{ column:'closing_txid', label: 'Closing Tx Id' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_node_pub', label: 'Pubkey' }, { column:'channel_point' }, { column:'initiator' },
+      allowedColumns: [{ column:'closing_txid', label: 'Closing Tx ID' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_node_pub', label: 'Pubkey' }, { column:'channel_point' }, { column:'initiator' },
       { column:'commitment_type' }, { column:'capacity' }, { column:'local_balance' }, { column:'remote_balance' }]
     },
     pending_waiting_close: {
       maxColumns: 7,
       disablePageSize: true,
-      allowedColumns: [{ column:'closing_txid', label: 'Closing Tx Id' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_node_pub', label: 'Pubkey' }, { column:'channel_point' }, { column:'initiator' },
+      allowedColumns: [{ column:'closing_txid', label: 'Closing Tx ID' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_node_pub', label: 'Pubkey' }, { column:'channel_point' }, { column:'initiator' },
       { column:'commitment_type' }, { column:'limbo_balance' }, { column:'capacity' }, { column:'local_balance' }, { column:'remote_balance' }]
     },
     closed: {
       maxColumns: 7,
-      allowedColumns: [{ column:'close_type' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_pubkey', label: 'Pubkey' }, { column:'channel_point' }, { column:'chan_id', label: 'Channel Id' },
+      allowedColumns: [{ column:'close_type' }, { column:'remote_alias', label: 'Peer' }, { column:'remote_pubkey', label: 'Pubkey' }, { column:'channel_point' }, { column:'chan_id', label: 'Channel ID' },
       { column:'closing_tx_hash', label: 'Closing Tx Hash' }, { column:'chain_hash' }, { column:'open_initiator' }, { column:'close_initiator' }, { column:'time_locked_balance', label: 'Timelocked Balance' },
       { column:'capacity' }, { column:'close_height' }, { column:'settled_balance' }]
     },
@@ -1140,7 +1140,7 @@ export const ECL_PAGE_DEFS: ECLPageDefinitions = {
   on_chain: {
     transaction: {
       maxColumns: 6,
-      allowedColumns: [{ column:'timestamp', label: 'Date/Time' }, { column:'address' }, { column:'blockHash' }, { column:'txid', label: 'Transaction Id' }, { column:'amount' },
+      allowedColumns: [{ column:'timestamp', label: 'Date/Time' }, { column:'address' }, { column:'blockHash' }, { column:'txid', label: 'Transaction ID' }, { column:'amount' },
       { column:'fees' }, { column:'confirmations' }]
     }
   },
@@ -1170,20 +1170,20 @@ export const ECL_PAGE_DEFS: ECLPageDefinitions = {
   transactions: {
     payments: {
       maxColumns: 7,
-      allowedColumns: [{ column:'firstPartTimestamp', label: 'Date/Time' }, { column:'id' }, { column:'recipientNodeId', label: 'Destination Node Id' }, { column:'recipientNodeAlias', label: 'Destination' },
+      allowedColumns: [{ column:'firstPartTimestamp', label: 'Date/Time' }, { column:'id' }, { column:'recipientNodeId', label: 'Destination Node ID' }, { column:'recipientNodeAlias', label: 'Destination' },
       { column:'description' }, { column:'paymentHash' }, { column:'paymentPreimage', label: 'Preimage' }, { column:'recipientAmount', label: 'Amount' }]
     },
     invoices: {
       maxColumns: 7,
-      allowedColumns: [{ column:'timestamp', label: 'Date Created' }, { column:'expiresAt', label: 'Date Expiry' }, { column:'receivedAt', label: 'Date Settled' }, { column:'nodeId', label: 'Node Id' }, { column:'description' },
+      allowedColumns: [{ column:'timestamp', label: 'Date Created' }, { column:'expiresAt', label: 'Date Expiry' }, { column:'receivedAt', label: 'Date Settled' }, { column:'nodeId', label: 'Node ID' }, { column:'description' },
       { column:'paymentHash' }, { column:'amount' }, { column:'amountSettled', label: 'Amount Settled' }]
     }
   },
   routing: {
     forwarding_history: {
       maxColumns: 7,
-      allowedColumns: [{ column:'timestamp', label: 'Date/Time' }, { column:'fromChannelId', label: 'In Channel Id' }, { column:'fromShortChannelId', label: 'In Channel Short Id' }, { column:'fromChannelAlias', label: 'In Channel' },
-      { column:'toChannelId', label: 'Out Channel Id' }, { column:'toShortChannelId', label: 'Out Channel Short Id' }, { column:'toChannelAlias', label: 'Out Channel' }, { column:'paymentHash' }, { column:'amountIn' },
+      allowedColumns: [{ column:'timestamp', label: 'Date/Time' }, { column:'fromChannelId', label: 'In Channel ID' }, { column:'fromShortChannelId', label: 'In Channel Short ID' }, { column:'fromChannelAlias', label: 'In Channel' },
+      { column:'toChannelId', label: 'Out Channel ID' }, { column:'toShortChannelId', label: 'Out Channel Short ID' }, { column:'toChannelAlias', label: 'Out Channel' }, { column:'paymentHash' }, { column:'amountIn' },
       { column:'amountOut' }, { column:'fee', label: 'Fee Earned' }]
     },
     routing_peers: {
@@ -1194,8 +1194,8 @@ export const ECL_PAGE_DEFS: ECLPageDefinitions = {
   reports: {
     routing: {
       maxColumns: 7,
-      allowedColumns: [{ column:'timestamp', label: 'Date/Time' }, { column:'fromChannelId', label: 'In Channel Id' }, { column:'fromShortChannelId', label: 'In Channel Short Id' }, { column:'fromChannelAlias', label: 'In Channel' },
-      { column:'toChannelId', label: 'Out Channel Id' }, { column:'toShortChannelId', label: 'Out Channel Short Id' }, { column:'toChannelAlias', label: 'Out Channel' }, { column:'paymentHash' }, { column:'amountIn' },
+      allowedColumns: [{ column:'timestamp', label: 'Date/Time' }, { column:'fromChannelId', label: 'In Channel ID' }, { column:'fromShortChannelId', label: 'In Channel Short ID' }, { column:'fromChannelAlias', label: 'In Channel' },
+      { column:'toChannelId', label: 'Out Channel ID' }, { column:'toShortChannelId', label: 'Out Channel Short ID' }, { column:'toChannelAlias', label: 'Out Channel' }, { column:'paymentHash' }, { column:'amountIn' },
       { column:'amountOut' }, { column:'fee', label: 'Fee Earned' }]
     },
     transactions: {