ADEN-1591 - Classname fix