Small changes here to better reflect what we currently do, more will need to happen after marketing#1224