Remove "-ondock" for naming consistency.