XD-702 Fix review comments
- Fix the wordings in the docs and the error key naming