Rename item to file_name
Improve cosmetics