diff --git a/packages/core/src/constants/index.ts b/packages/core/src/constants/index.ts
index 6dbd3d56..20e8ac8d 100644
--- a/packages/core/src/constants/index.ts
+++ b/packages/core/src/constants/index.ts
@@ -6,7 +6,7 @@ import {TransactionLeasingSubtype} from './transactionLeasingSubtype';
 import {TransactionMarketplaceSubtype} from './transactionMarketplaceSubtype';
 import {TransactionPaymentSubtype} from './transactionPaymentSubtype';
 import {TransactionMiningSubtype} from './transactionMiningSubtype';
-import {TransactionEscrowSubtype} from './transactionEscrowSubtype';
+import {TransactionAdvancedPaymentSubtype} from './transactionAdvancedPaymentSubtype';
 import {TransactionSmartContractSubtype} from './transactionSmartContractSubtype';
 
 /**
@@ -44,6 +44,6 @@ export {
     TransactionAssetSubtype,
     TransactionArbitrarySubtype,
     TransactionMiningSubtype,
-    TransactionEscrowSubtype,
+    TransactionAdvancedPaymentSubtype,
     TransactionSmartContractSubtype
 };
diff --git a/packages/core/src/constants/transactionEscrowSubtype.ts b/packages/core/src/constants/transactionAdvancedPaymentSubtype.ts
similarity index 66%
rename from packages/core/src/constants/transactionEscrowSubtype.ts
rename to packages/core/src/constants/transactionAdvancedPaymentSubtype.ts
index c654b1c6..a105fea9 100644
--- a/packages/core/src/constants/transactionEscrowSubtype.ts
+++ b/packages/core/src/constants/transactionAdvancedPaymentSubtype.ts
@@ -1,13 +1,14 @@
 /**
  * Original work Copyright (c) 2019 Burst Apps Team
+ * Modified 2024, Signum Network
  */
 
 /**
- * Constants for escrow subtypes
+ * Constants for advanced payment subtypes
  *
  * @category transaction-types
  */
-export enum TransactionEscrowSubtype {
+export enum TransactionAdvancedPaymentSubtype {
     EscrowCreation = 0,
     EscrowSigning,
     EscrowResult,
diff --git a/packages/core/src/constants/transactionAssetSubtype.ts b/packages/core/src/constants/transactionAssetSubtype.ts
index af3d976a..7e2fe174 100644
--- a/packages/core/src/constants/transactionAssetSubtype.ts
+++ b/packages/core/src/constants/transactionAssetSubtype.ts
@@ -4,7 +4,7 @@
  */
 
 /**
- * Constants for asset subtypes
+ * Constants for asset/token subtypes
  * 
  * @category transaction-types
  */
diff --git a/packages/core/src/constants/transactionType.ts b/packages/core/src/constants/transactionType.ts
index c1f6a281..1538cf03 100644
--- a/packages/core/src/constants/transactionType.ts
+++ b/packages/core/src/constants/transactionType.ts
@@ -13,30 +13,36 @@
  */
 export enum TransactionType {
     /**
-     * @see TransactionPaymentSubtype
+     * {@link TransactionPaymentSubtype}
      */
     Payment = 0,
     /**
-     * @see TransactionArbitrarySubtype
+     * {@link TransactionArbitrarySubtype}
      */
     Arbitrary,
     /**
-     * @see TransactionAssetSubtype
+     * {@link TransactionAssetSubtype}
      */
     Asset,
     /**
-     * @see TransactionMarketplaceSubtype
+     * {@link TransactionMarketplaceSubtype}
      */
     Marketplace,
     /**
-     * @see TransactionLeasingSubtype
+     * {@link TransactionLeasingSubtype}
      */
     Leasing,
     /**
-     * @see TransactionMiningSubtype
+     * {@link TransactionMiningSubtype}
      */
     Mining = 20,
-    Escrow = 21,
-    AT = 22,
+    /**
+     * {@link TransactionEscrowSubtype}
+     */
+    AdvancedPayment = 21,
+    /**
+     * {@link TransactionSmartContractSubtype}
+     */
+    SmartContract = 22,
 }
 
diff --git a/packages/core/src/transaction/__tests__/getRecipientsAmount.spec.ts b/packages/core/src/transaction/__tests__/getRecipientsAmount.spec.ts
index c1e418bc..43ab08b9 100644
--- a/packages/core/src/transaction/__tests__/getRecipientsAmount.spec.ts
+++ b/packages/core/src/transaction/__tests__/getRecipientsAmount.spec.ts
@@ -1,5 +1,5 @@
 import {
-    TransactionEscrowSubtype,
+    TransactionAdvancedPaymentSubtype,
     TransactionPaymentSubtype,
     TransactionType
 } from '../../constants';
@@ -30,8 +30,8 @@ describe('getRecipientsAmount', () => {
         const transaction = {
             transaction: '1',
             amountNQT: Amount.fromSigna(100).getPlanck(),
-            type: TransactionType.Escrow,
-            subtype: TransactionEscrowSubtype.EscrowCreation,
+            type: TransactionType.AdvancedPayment,
+            subtype: TransactionAdvancedPaymentSubtype.EscrowCreation,
         };
 
         // @ts-ignore
diff --git a/packages/core/src/transaction/__tests__/isMultiOutSameTransaction.spec.ts b/packages/core/src/transaction/__tests__/isMultiOutSameTransaction.spec.ts
index d597a02b..79a54b00 100644
--- a/packages/core/src/transaction/__tests__/isMultiOutSameTransaction.spec.ts
+++ b/packages/core/src/transaction/__tests__/isMultiOutSameTransaction.spec.ts
@@ -25,7 +25,7 @@ describe('isMultiOutSameTransaction', () => {
     it('returns false on wrong type', () => {
 
         const transaction = {
-            type: TransactionType.Escrow,
+            type: TransactionType.AdvancedPayment,
             subtype: TransactionPaymentSubtype.Ordinary
         };
 
diff --git a/packages/core/src/transaction/__tests__/isMultiOutTransaction.spec.ts b/packages/core/src/transaction/__tests__/isMultiOutTransaction.spec.ts
index aad9dc52..cec07fb9 100644
--- a/packages/core/src/transaction/__tests__/isMultiOutTransaction.spec.ts
+++ b/packages/core/src/transaction/__tests__/isMultiOutTransaction.spec.ts
@@ -25,7 +25,7 @@ describe('isMultiOutTransaction', () => {
     it('returns false on wrong type', () => {
 
         const transaction = {
-            type: TransactionType.Escrow,
+            type: TransactionType.AdvancedPayment,
             subtype: TransactionPaymentSubtype.Ordinary
         };