Merge pull request #23 from gabemontero/issue3358

get names consistent; associated doc updates based on test walkthrough