Fix: Undefined class, useless aliasing

This PR

* [x] fixes an issue where a class seems undefined
* [x] removes useless alias