0.6.1.16 - a bit refactor getFileName