Refactoring

- change variable name
- change class name
Refactoring