renamed classes for better alignment to actual representation