Make internal references match configuration references and update README

Small tweaks to make internal references match the newly renamed configuration items.  I also changed the README.md file to reflect the new config items.