↑

Improve naming of classes to identify better with intention

Improve merge request time spent in testing by fixing unstable unit tests

↓