[Olena-patches] milena r2207: Remove useless '_' in class names