Matched classnames with filenames

@dougbu @rynowak