changed some filenames and variable names