diff --git a/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue b/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
index fbf415897..dffe5ec11 100644
--- a/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
+++ b/frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
@@ -3,7 +3,7 @@
     :link-data="linkData"
     :redeem-code="redeemCode"
     :is-contribution-link="isContributionLink"
-    :is-disbursement-link="isDisbursementLink"
+    :is-redeem-jwt-link="isRedeemJwtLink"
     class="redeem-community-selection"
   >
     <BCard bg-variant="muted" text-variant="dark" border-variant="info">
@@ -11,16 +11,16 @@
       <h1 v-if="!isContributionLink && linkData.amount !== ''">
         <BCol class="mb-4" cols="12">
           <BRow>
-            <BCol v-if="!isDisbursementLink">
+            <BCol v-if="!isRedeemJwtLink">
               {{ $t('gdd_per_link.recipientCommunitySelection') }}
             </BCol>
             <BCol v-else>{{ $t('gdd_per_link.recipientCommunityFix') }}</BCol>
           </BRow>
           <h3>
             <BRow>
-              <BCol v-if="!isDisbursementLink" class="fw-bold">
+              <BCol v-if="!isRedeemJwtLink" class="fw-bold">
                 <community-switch
-                  :disabled="isDisbursementLink"
+                  :disabled="isRedeemJwtLink"
                   :model-value="currentRecipientCommunity"
                   @update:model-value="setRecipientCommunity"
                 />
@@ -56,7 +56,7 @@ const props = defineProps({
   linkData: { type: Object, required: true },
   redeemCode: { type: String, required: true },
   isContributionLink: { type: Boolean, default: false },
-  isDisbursementLink: { type: Boolean, default: false },
+  isRedeemJwtLink: { type: Boolean, default: false },
   recipientCommunity: {
     type: Object,
     required: false,
diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue
index 7b22543e7..bcf2129e8 100644
--- a/frontend/src/components/LinkInformations/RedeemInformation.vue
+++ b/frontend/src/components/LinkInformations/RedeemInformation.vue
@@ -6,7 +6,7 @@
         {{ CONFIG.COMMUNITY_NAME }}
         {{ $t('contribution-link.thanksYouWith') }} {{ $filters.GDD(linkData.amount) }}
       </h1>
-      <h3 v-if="isDisbursementLink && linkData.amount !== ''">
+      <h3 v-if="isRedeemJwtLink && linkData.amount !== ''">
         {{ '"' + linkData.senderCommunity.name + '.' + linkData.senderUser.firstName + '"' }}
         {{ $t('transaction-link.send_you') }} {{ $filters.GDD(linkData.amount) }}
       </h3>
@@ -22,7 +22,7 @@ export default {
   props: {
     linkData: { type: Object, required: true },
     isContributionLink: { type: Boolean, default: false },
-    isDisbursementLink: { type: Boolean, default: false },
+    isRedeemJwtLink: { type: Boolean, default: false },
   },
   data() {
     return {
diff --git a/frontend/src/components/LinkInformations/RedeemValid.vue b/frontend/src/components/LinkInformations/RedeemValid.vue
index 9e252566f..aaf52d313 100644
--- a/frontend/src/components/LinkInformations/RedeemValid.vue
+++ b/frontend/src/components/LinkInformations/RedeemValid.vue
@@ -3,7 +3,7 @@
     <redeem-information
       :link-data="linkData"
       :is-contribution-link="isContributionLink"
-      :is-disbursement-link="isDisbursementLink"
+      :is-redeem-jwt-link="isRedeemJwtLink"
       :valid-link="validLink"
     />
     <BCard>
@@ -31,7 +31,7 @@ export default {
   props: {
     linkData: { type: Object, required: true },
     isContributionLink: { type: Boolean, default: false },
-    isDisbursementLink: { type: Boolean, default: false },
+    isRedeemJwtLink: { type: Boolean, default: false },
     validLink: { type: Boolean, default: false },
   },
 }
diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue
index b66bc3974..1739233a8 100644
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@@ -8,7 +8,7 @@
             :link-data="linkData"
             :redeem-code="redeemCode"
             :is-contribution-link="isContributionLink"
-            :is-disbursement-link="isDisbursementLink"
+            :is-redeem-jwt-link="isRedeemJwtLink"
           />
         </template>
 
@@ -20,7 +20,7 @@
           <redeem-valid
             :link-data="linkData"
             :is-contribution-link="isContributionLink"
-            :is-disbursement-link="isDisbursementLink"
+            :is-redeem-jwt-link="isRedeemJwtLink"
             :valid-link="validLink"
             @mutation-link="mutationLink"
           />
@@ -89,8 +89,8 @@ const isContributionLink = computed(() => {
   return params.code?.search(/^CL-/) === 0
 })
 
-const isDisbursementLink = computed(() => {
-  if (result.value?.queryTransactionLink?.__typename === 'DisbursementLink') {
+const isRedeemJwtLink = computed(() => {
+  if (result.value?.queryTransactionLink?.__typename === 'RedeemJwtLink') {
     return true
   }
   return false
@@ -130,10 +130,10 @@ const itemType = computed(() => {
       return 'REDEEM_SELECT_COMMUNITY'
     }
     if (
-      (!isDisbursementLink.value &&
+      (!isRedeemJwtLink.value &&
         linkData.value.recipientUser &&
         store.state.gradidoID === linkData.value.recipientUser.gradidoID) ||
-      (isDisbursementLink.value &&
+      (isRedeemJwtLink.value &&
         linkData.value.senderUser.gradidoID === linkData.value.recipientUser.gradidoID)
     ) {
       console.log('TransactionLink.itemType... SELF_CREATOR')