[FIX-IMP][TASKS 8998 8995] Fix filename formats + Improve error messages