Clarify some variable names