Change some variable names to add clarity