Make internal references match configuration references and update README.md to match.
Merge pull request #625 from leprechau/v3.0.x

Make internal references match configuration references and update README