Updated some variable names for clarity.