NXP-13471: Fix filename creation issue