change some variable names for consistency