Switch wording to imperative instead of sync. Consistently use interface names. Original pull request: #520.
closes: #519 Original pull request: #520.