Fixes #4287: Optimisation on name
Merge pull request #399 from VinceMacBuche/bug/4287/optimzation_name

Fixes #4287: Optimisation on name