[enhancement] Shorter var names