Adjust wording - closes #823