Changed names to reduce redundancy.

Allows efficient use of TAB for autocomplete.