renamed files to be code style compliant, changed variable names for the same reason