Updated naming to be more consistent.