#132: Classes renamed to follow naming conventions. Including sample scenarios and tests