CHANGED NAMES OF TOO MANY THINGS

Enforcing the rule where underscores separate words in variable names.