Updated File Naming case issues