Update naming a bit to be a little more meaningful