Name variables consistently