Corrects most references to point to the current command. Additional references to deprecated command fixed by PR #1198 . We should merge 1198 at the same time we merge this one.
