Make and vars naming more consistent.
Make and vars naming more consistent.