Renamed some words to be more in line with system style.