Give smell class and smell sub class better names

* Fixes #342 
* Depending on #328 and #345 - those need to be merged first