rename some files to make file names more consistent