Fixed up some naming of files.