correct last files - finished

corrected filenames and variable names in the rest of the files.
Finished first go through.