Folders and files now follow the same naming convention