Fix version
Improve name generation
Fix version