ENYO-2497: remove Scroller naming