File Name Validation Improved