More variable renaming for clarity.