Layout specification and discovery should follow the same behavior as partials

Fixes #1047
pick one name and use it for both the class and the containing file