Instead of renaming all atoms before, rename them after only after knowing which have to be unique.

[bieniekmateusz]

This way the atom names will remain as similar as they were originally, helping the end user.