LILY-220: renamed classes to make more sense