Better naming of files