diff --git a/src/Gargantext/Components/Forest/Tree.purs b/src/Gargantext/Components/Forest/Tree.purs
index 671a64c48026b9227b5f98e786d4c4703f9bebd6..744b0a0b66011a72255a71d79ad9304320263c71 100644
--- a/src/Gargantext/Components/Forest/Tree.purs
+++ b/src/Gargantext/Components/Forest/Tree.purs
@@ -204,14 +204,14 @@ performAction { reload: (_ /\ setReload)
 
 performAction p@{ reload: (_ /\ setReload)
                 , session
-                , tree: (NTree (LNode {id}) _) } (Submit name)  = do
+                , tree: (NTree (LNode {id}) _) } (RenameNode name)  = do
   void $ renameNode session id $ RenameValue {name}
   performAction p RefreshTree
 
 performAction p@{ openNodes: (_ /\ setOpenNodes)
                 , reload:    (_ /\ setReload)
                 , session
-                , tree: (NTree (LNode {id}) _) } (CreateSubmit name nodeType) = do
+                , tree: (NTree (LNode {id}) _) } (AddNode name nodeType) = do
   task <- addNode session id $ AddNodeValue {name, nodeType}
   liftEffect do
     setOpenNodes (Set.insert (mkNodeId session id))
diff --git a/src/Gargantext/Components/Forest/Tree/Node/Action.purs b/src/Gargantext/Components/Forest/Tree/Node/Action.purs
index ddb118e497ac9de964b60185e71ee2828cfa29cd..54af1b0168a68ecd268d13f8da4f8841654e3e1a 100644
--- a/src/Gargantext/Components/Forest/Tree/Node/Action.purs
+++ b/src/Gargantext/Components/Forest/Tree/Node/Action.purs
@@ -15,11 +15,11 @@ import Gargantext.Sessions (Session, get, put, post, delete)
 import Gargantext.Routes as GR
 import Gargantext.Types  as GT
 
-data Action = CreateSubmit String GT.NodeType
+data Action = AddNode String GT.NodeType
             | DeleteNode
             | UpdateNode  GT.AsyncTaskWithType
+            | RenameNode  String
             | SearchQuery GT.AsyncTaskWithType
-            | Submit      String
             | UploadFile  GT.NodeType FileType (Maybe String) UploadFileContents
             | RefreshTree
 
diff --git a/src/Gargantext/Components/Forest/Tree/Node/Action/Add.purs b/src/Gargantext/Components/Forest/Tree/Node/Action/Add.purs
index ce34c240ab89bb23c31526887002ebc3c375c23e..bee82f19a75aece91ba52dd277e1e5f40d4c4a8d 100644
--- a/src/Gargantext/Components/Forest/Tree/Node/Action/Add.purs
+++ b/src/Gargantext/Components/Forest/Tree/Node/Action/Add.purs
@@ -125,7 +125,7 @@ addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
                      , onClick: mkEffectFn1 $ \_ -> do
                          -- TODO
                          --setPopupOpen $ const Nothing
-                         launchAff    $ dispatch $ CreateSubmit name' nt
+                         launchAff    $ dispatch $ AddNode name' nt
                      } [H.text "Add"]
           ]
 
diff --git a/src/Gargantext/Components/Forest/Tree/Node/Action/Rename.purs b/src/Gargantext/Components/Forest/Tree/Node/Action/Rename.purs
index 204f559e607523b3f8e6c629d3b05a734e1fb83d..fce6194392b4f8a66c06241f9c5816cb832f5349 100644
--- a/src/Gargantext/Components/Forest/Tree/Node/Action/Rename.purs
+++ b/src/Gargantext/Components/Forest/Tree/Node/Action/Rename.purs
@@ -65,7 +65,7 @@ renameBox p@{ dispatch, renameBoxOpen: (true /\ setRenameBoxOpen) } = R.createEl
               , type: "button"
               , onClick: mkEffectFn1 $ \_ -> do
                     setRenameBoxOpen $ const false
-                    launchAff $ dispatch $ Submit newName
+                    launchAff $ dispatch $ RenameNode newName
               , title: "Rename"
               } []
         cancelBtn =