Upgrading get_file_name
Creting ext file under correct name
Cleanup