Refactoring

Update wording of class and variable to respect the camelCase.