Minor fixes

Changed the name creation template in files