Rename files so they match directive names