Unified variable naming