diff --git a/project.py b/project.py
index 0d20c30..9bf5c6f 100644
--- a/project.py
+++ b/project.py
@@ -122,6 +122,7 @@ def create_project(project, conn):
 
 
 def edit_project(project, project_id, conn):
+    # FIXME Duplicate code with edit_task
     logging.info(">> Edit project")
 
     update_args = [item for item in project.__dict__.items() if item[1] is not None]
@@ -137,6 +138,11 @@ def edit_project(project, project_id, conn):
 
     logging.debug("Project update args: %s", update_args)
 
+    # Retrieve name if not updated
+    project_name = None
+    if "name" not in update_args[0]:
+        project_name = get_project_name(project_id, conn)
+
     query = "UPDATE project SET {} WHERE id = ?"
     query = query.format(", ".join("%s = '%s'" % (k, v) for k, v in update_args))
     logging.debug("update project query: %s", query)
@@ -146,10 +152,15 @@ def edit_project(project, project_id, conn):
     cursor.execute(query, (project_id,))
 
     log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args)
-    print("updated project {}: ({})".format(project_id, log_args))
-    # TODO Print project name ?
 
-    record_action(cursor, TypeAction.UPDATE, "({})".format(log_args), project_id)
+    if project_name:
+        log_message = "{} ({})".format(project_name, log_args)
+    else:
+        log_message = "({})".format(log_args)
+
+    print("updated project {}: {}".format(project_id, log_message))
+
+    record_action(cursor, TypeAction.UPDATE, log_message, project_id)
 
 
 def delete_project(project_id, conn):
diff --git a/task.py b/task.py
index a26ac37..ef3bc7d 100644
--- a/task.py
+++ b/task.py
@@ -176,6 +176,7 @@ def create_task(task, project_id, conn):
 
 
 def edit_task(task, task_id, conn):
+    # FIXME Duplicate code with edit_project
     logging.info(">> Edit task")
 
     update_args = [item for item in task.__dict__.items() if item[1] is not None]
@@ -207,17 +208,14 @@ def edit_task(task, task_id, conn):
     log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args)
 
     if task_name:
-        print("updated task {}: {} ({})".format(task_id, task_name, log_args))
+        log_message = "{} ({})".format(task_name, log_args)
     else:
-        print("updated task {}: ({})".format(task_id, log_args))
+        log_message = "({})".format(log_args)
+
+    print("updated task {}: {}".format(task_id, log_message))
 
     logging.debug("UPDATE TASK - ACTION MESSAGE : %s", log_args)
-    record_action(
-        cursor,
-        TypeAction.UPDATE,
-        "{}({})".format(task_name + " " if task_name else "", log_args),
-        task_id=task_id,
-    )
+    record_action(cursor, TypeAction.UPDATE, log_message, task_id=task_id)
 
 
 def moving_task(task_id, dest_project_id, conn):