DDC-3005. Renamed class by removing underscore