Update CLI to reflect name changes.