Make naming a bit more consistent across everything