improve consistency of filenaming