fix naming and docs
Merge pull request #330 from metamx/s3-docs-naming

fix naming and docs