Change name generation

Signed-off-by: JulienA <ju.aubert87@gmail.com>