refactor :changed some class name