Minor refactor of internal variable names to be a bit more consistent.