issue #4895:rename class.