Make file names more descriptive