change some internal variable names for clarity