Refine variable names