Matched classnames with filenames

@dougbu @rynowak 
`DefaultDisplayTemplatesTest` (add an 's' to "templates")