As stated in #622 I'm neither happy with these class names and I am open to any better suggestion.