Update names to be a little more clear