Updated internal variable names.