refactor change handler name to its method