DIRECTORY_NAME & FILE_NAME macro changes