Updated handling for fileName in application