Bad name,

I still don't get why these need to be 2 different things. What ticket are you solving with this PR?