Update naming scheme for directories and files