diff --git a/src/components/common/TreeExplorer.vue b/src/components/common/TreeExplorer.vue
index c63f9d45a..a4f5c7742 100644
--- a/src/components/common/TreeExplorer.vue
+++ b/src/components/common/TreeExplorer.vue
@@ -19,12 +19,12 @@
   >
     <template #folder="{ node }">
       <slot name="folder" :node="node">
-        <TreeFolder :node="node" />
+        <TreeExplorerTreeNode :node="node" />
       </slot>
     </template>
     <template #node="{ node }">
       <slot name="node" :node="node">
-        <TreeNode :node="node.data" />
+        <TreeExplorerTreeNode :node="node" />
       </slot>
     </template>
   </Tree>
@@ -34,8 +34,7 @@
 import { ref, computed, provide } from 'vue'
 import Tree from 'primevue/tree'
 import ContextMenu from 'primevue/contextmenu'
-import TreeFolder from '@/components/common/treeExplorer/TreeFolder.vue'
-import TreeNode from '@/components/common/treeExplorer/TreeNode.vue'
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
 import type {
   RenderedTreeExplorerNode,
   TreeExplorerNode
diff --git a/src/components/common/treeExplorer/TreeFolder.vue b/src/components/common/TreeExplorerTreeNode.vue
similarity index 57%
rename from src/components/common/treeExplorer/TreeFolder.vue
rename to src/components/common/TreeExplorerTreeNode.vue
index ee1c8a3dc..f958d0b8e 100644
--- a/src/components/common/treeExplorer/TreeFolder.vue
+++ b/src/components/common/TreeExplorerTreeNode.vue
@@ -1,33 +1,56 @@
 <template>
-  <div :class="['tree-folder', { 'can-drop': canDrop }]" ref="container">
-    <span class="folder-label">
-      <slot name="folder-label" :node="props.node">
-        {{ props.node.label }}
+  <div
+    :class="[
+      'tree-node',
+      {
+        'can-drop': canDrop,
+        'tree-folder': !props.node.leaf,
+        'tree-leaf': props.node.leaf
+      }
+    ]"
+    ref="container"
+  >
+    <div class="node-content">
+      <span class="node-label">
+        <slot name="before-label" :node="props.node"></slot>
+        <EditableText
+          :modelValue="node.label"
+          :isEditing="isEditing"
+          @edit="(newName: string) => props.node.handleRename(node, newName)"
+        />
+        <slot name="after-label" :node="props.node"></slot>
+      </span>
+      <Badge
+        v-if="!props.node.leaf"
+        :value="props.node.totalLeaves"
+        severity="secondary"
+        class="leaf-count-badge"
+      />
+      <slot name="actions" :node="node">
+        <!-- Default slot content for actions -->
       </slot>
-    </span>
-    <Badge
-      v-if="props.node.totalLeaves"
-      :value="props.node.totalLeaves"
-      severity="secondary"
-      class="leaf-count-badge"
-    />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted, inject, Ref, computed } from 'vue'
 import Badge from 'primevue/badge'
-import type {
-  TreeExplorerDragAndDropData,
-  RenderedTreeExplorerNode
-} from '@/types/treeExplorerTypes'
 import {
   dropTargetForElements,
   draggable
 } from '@atlaskit/pragmatic-drag-and-drop/element/adapter'
+import type {
+  TreeExplorerDragAndDropData,
+  RenderedTreeExplorerNode,
+  TreeExplorerNode
+} from '@/types/treeExplorerTypes'
+import EditableText from '@/components/common/EditableText.vue'
+
 const props = defineProps<{
   node: RenderedTreeExplorerNode
 }>()
+
 const emit = defineEmits<{
   (
     e: 'itemDropped',
@@ -37,6 +60,15 @@ const emit = defineEmits<{
   (e: 'dragStart', node: RenderedTreeExplorerNode): void
   (e: 'dragEnd', node: RenderedTreeExplorerNode): void
 }>()
+
+const labelEditable = computed<boolean>(() => !!props.node.handleRename)
+const renameEditingNode = inject(
+  'renameEditingNode'
+) as Ref<TreeExplorerNode | null>
+const isEditing = computed(
+  () => labelEditable.value && renameEditingNode.value?.key === props.node.key
+)
+
 const container = ref<HTMLElement | null>(null)
 const canDrop = ref(false)
 const treeNodeElement = ref<HTMLElement | null>(null)
@@ -84,11 +116,21 @@ onUnmounted(() => {
 </script>
 
 <style scoped>
-.tree-folder {
+.tree-node {
+  width: 100%;
   display: flex;
   align-items: center;
+  justify-content: space-between;
 }
 .leaf-count-badge {
   margin-left: 0.5rem;
 }
+.node-content {
+  display: flex;
+  align-items: center;
+  flex-grow: 1;
+}
+.leaf-label {
+  margin-left: 0.5rem;
+}
 </style>
diff --git a/src/components/common/treeExplorer/TreeNode.vue b/src/components/common/treeExplorer/TreeNode.vue
deleted file mode 100644
index ea73c5513..000000000
--- a/src/components/common/treeExplorer/TreeNode.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <div class="tree-leaf" ref="container">
-    <div class="leaf-content">
-      <span class="leaf-label">
-        <slot name="label" :node="node">
-          {{ props.node.label }}
-        </slot>
-      </span>
-    </div>
-    <slot name="actions" :node="node">
-      <!-- Default slot content for actions -->
-    </slot>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
-import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter'
-import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
-const props = defineProps<{
-  node: RenderedTreeExplorerNode
-}>()
-const emit = defineEmits<{
-  (e: 'dragStart', node: RenderedTreeExplorerNode): void
-  (e: 'dragEnd', node: RenderedTreeExplorerNode): void
-}>()
-const container = ref<HTMLElement | null>(null)
-let draggableCleanup: () => void
-onMounted(() => {
-  const treeNodeElement = container.value?.closest(
-    '.p-tree-node'
-  ) as HTMLElement
-  draggableCleanup = draggable({
-    element: treeNodeElement,
-    getInitialData() {
-      return {
-        type: 'tree-explorer-node',
-        data: props.node
-      }
-    },
-    onDragStart: () => emit('dragStart', props.node),
-    onDrop: () => emit('dragEnd', props.node)
-  })
-})
-onUnmounted(() => {
-  if (draggableCleanup) {
-    draggableCleanup()
-  }
-})
-</script>
-
-<style scoped>
-.tree-leaf {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.leaf-content {
-  display: flex;
-  align-items: center;
-  flex-grow: 1;
-}
-.leaf-label {
-  margin-left: 0.5rem;
-}
-</style>
diff --git a/src/types/treeExplorerTypes.ts b/src/types/treeExplorerTypes.ts
index 9ce088fb7..ef3adb215 100644
--- a/src/types/treeExplorerTypes.ts
+++ b/src/types/treeExplorerTypes.ts
@@ -1,5 +1,3 @@
-import { Ref } from 'vue'
-
 export interface TreeExplorerNode<T = any> {
   key: string
   label: string
@@ -8,6 +6,8 @@ export interface TreeExplorerNode<T = any> {
   children?: TreeExplorerNode<T>[]
   icon?: string
   getIcon?: (node: TreeExplorerNode<T>) => string
+  // Function to handle renaming the node
+  handleRename?: (node: TreeExplorerNode<T>, newName: string) => void
 }
 
 export interface RenderedTreeExplorerNode<T = any> extends TreeExplorerNode<T> {
@@ -22,10 +22,3 @@ export type TreeExplorerDragAndDropData<T = any> = {
   type: 'tree-explorer-node'
   data: RenderedTreeExplorerNode<T>
 }
-
-export interface TreeExplorerNodeSlotProps {
-  node: RenderedTreeExplorerNode
-  handleItemDropped: (node: RenderedTreeExplorerNode) => void
-  renameEditingNode: Ref<RenderedTreeExplorerNode | null>
-  handleRename: (node: RenderedTreeExplorerNode, newName: string) => void
-}