Unified variable names