* Fix some names * reorder unit in CMake --------- Co-authored-by: Christian Semmler <mail@csemmler.com>