Make internal references match configuration references and update README.md to match.