Clean up some variable names for clarity