Name changed
Improve the files creation