Refactor : change class name