Change vocabulary to close issue 230