Change file names. change part of program to match code style