VE-1609: Properly use proper method for proper filename resolution