Naming conformance with internal guidelines.
Merge branch 'master' of github.com:sbt/sbt-web