Created by: efritz
I'm adding observability things to these components soon and they need to be distinguishable before that.