renamed some vars for consistency