diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ead322..1272056e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGELOG for FlatCAM beta
 18.09.2021
 
 - some code reformatting in Extract Plugin
+- fixed the Geometry object merge functionality
+- fixed a message when renaming an object
 
 15.09.2021
 
diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py
index 0c2c7656..04ff3732 100644
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -1595,7 +1595,7 @@ class GeometryObject(FlatCAMObj, Geometry):
 
             # find tools that have the same tool_type and group them by tool_type
             for k, v in new_tools.items():
-                same_tool_type[v['tool_type']].append(k)
+                same_tool_type[v['data']['tools_mill_tool_shape']].append(k)
 
             # find the intersections in the above groups
             intersect_list = []
diff --git a/appObjects/ObjectCollection.py b/appObjects/ObjectCollection.py
index 9f4b9920..d7d9eecf 100644
--- a/appObjects/ObjectCollection.py
+++ b/appObjects/ObjectCollection.py
@@ -528,8 +528,8 @@ class ObjectCollection(QtCore.QAbstractItemModel):
                             "setData() --> Could not remove the old object name from auto-completer model list. %s" %
                             str(e))
                     # obj.build_ui()
-                    self.app.inform.emit(_("Object renamed from <b>{old}</b> to <b>{new}</b>").format(old=old_name,
-                                                                                                      new=new_name))
+                    msg = "%s: <b>%s</b> %s: <b>%s</b>" % (_("Object renamed from"), old_name, _("to"), new_name)
+                    self.app.inform.emit(msg)
 
             self.dataChanged.emit(index, index)
             return True