diff --git a/domain/miningmanager/mempool/model.go b/domain/miningmanager/mempool/model.go
index 8235efb03..2c4c058ab 100644
--- a/domain/miningmanager/mempool/model.go
+++ b/domain/miningmanager/mempool/model.go
@@ -8,10 +8,10 @@ import (
 type idToTransaction map[externalapi.DomainTransactionID]*mempoolTransaction
 
 type mempoolTransaction struct {
-	transaction    *externalapi.DomainTransaction
-	parentsInPool  idToTransaction
-	isHighPriority bool
-	addAtDAAScore  uint64
+	transaction     *externalapi.DomainTransaction
+	parentsInPool   idToTransaction
+	isHighPriority  bool
+	addedAtDAAScore uint64
 }
 
 func (mt *mempoolTransaction) transactionID() *externalapi.DomainTransactionID {
diff --git a/domain/miningmanager/mempool/orphan_pool.go b/domain/miningmanager/mempool/orphan_pool.go
index 2c83ca6dc..999a66ea2 100644
--- a/domain/miningmanager/mempool/orphan_pool.go
+++ b/domain/miningmanager/mempool/orphan_pool.go
@@ -2,11 +2,12 @@ package mempool
 
 import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 
-type previousOutpointToOrphans map[externalapi.DomainOutpoint]idToTransaction
+type idToOrphan map[externalapi.DomainTransactionID]*orphanTransaction
+type previousOutpointToOrphans map[externalapi.DomainOutpoint]idToOrphan
 
 type orphansPool struct {
 	mempool                  *mempool
-	allOrphans               idToTransaction
+	allOrphans               idToOrphan
 	orphanByPreviousOutpoint previousOutpointToOrphans
 	lastExpireScan           uint64
 }
@@ -14,7 +15,7 @@ type orphansPool struct {
 func newOrphansPool(mp *mempool) *orphansPool {
 	return &orphansPool{
 		mempool:                  mp,
-		allOrphans:               idToTransaction{},
+		allOrphans:               idToOrphan{},
 		orphanByPreviousOutpoint: previousOutpointToOrphans{},
 		lastExpireScan:           0,
 	}
@@ -57,7 +58,7 @@ func (op *orphansPool) expireOrphanTransactions() error {
 		}
 
 		// Remove all transactions whose addedAtDAAScore is older then transactionExpireIntervalDAAScore
-		if virtualDAAScore-orphanTransaction.addAtDAAScore > op.mempool.config.orphanExpireIntervalDAAScore {
+		if virtualDAAScore-orphanTransaction.addedAtDAAScore > op.mempool.config.orphanExpireIntervalDAAScore {
 			err = op.removeOrphan(orphanTransaction.transactionID())
 			if err != nil {
 				return err
diff --git a/domain/miningmanager/mempool/transactions_pool.go b/domain/miningmanager/mempool/transactions_pool.go
index c67a99946..aeea1f320 100644
--- a/domain/miningmanager/mempool/transactions_pool.go
+++ b/domain/miningmanager/mempool/transactions_pool.go
@@ -51,7 +51,7 @@ func (tp *transactionsPool) expireOldTransactions() error {
 		}
 
 		// Remove all transactions whose addedAtDAAScore is older then transactionExpireIntervalDAAScore
-		if virtualDAAScore-mempoolTransaction.addAtDAAScore > tp.mempool.config.transactionExpireIntervalDAAScore {
+		if virtualDAAScore-mempoolTransaction.addedAtDAAScore > tp.mempool.config.transactionExpireIntervalDAAScore {
 			err = tp.mempool.RemoveTransaction(mempoolTransaction.transactionID())
 			if err != nil {
 				return err