Naming correction

Correct variable names to be more understandable and less diverse.