Some fixes and name changes in Sprite class