more consistent naming of files