Rename default controls to be more descriptive

The original control names will be removed in the 3.0 release but remain here for backwards compatibility.

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #698 from cbmi/issue-430

Rename default controls to be more descriptive