More file name changes

Changed file names to include underscore between words for readability.