modified file incorrectly
more renaming
fixed names