Better naming of the import files