I have had this problem from time to time and someone was kind enough to send me an addon to work around the problem. UniqueGeometryNames_210111.zip (1.5 KB)
To use: Select all components you want to give unique geometry names (Ctrl + A may come in handy), right-click and select “Make Unique Geometry Names”.
Note: You only need to do this procedure when you add new components to the layout, not before every save.