Bikeshed command name and improve help.
Closes #3772 (closed).
This will create a new commit in order to revert the existing changes.
