If i create a new entity via the diagram it is saved as newentity.entity.cm. This is also the id it is given. I have to manually rename it to the proper name and update the ID.
The filename and ID should be set based on the name that the entity is given.

In a normal workflow i would open a diagram, create several new entities, add relationships between the entities.
If i have to update all the ID's after this it is really cumbersome (files need renaming, relationshipnames are incorrect, relationships reference incorrect entity ID's, diagram references incorrect entity ID's).