[enhancement] Better var names