Improve generated names as suggested by Olivier Chafik.