Class names refactor