Keep the same file naming scheme
Add missing informations