Layout specification and discovery should follow the same behavior as partials

Fixes #1047
- "a" -> "an"
- nit: "used in" -> "as"