Removed inner template name from doc and tests.

svn path=; revision=84423