Agree. I left it like this for now, we can fix all over the place and change the name in a subsequent commit.