In create screen, align terminology between "type" and "templates"

The create screen currenty contains a section titled "Type" which gives the ability to choose a "Template". This is a bit confusing since a type (XClass) is different from a template (XWiki template) both in everyday language and in XWiki terminology. Maybe "type" would be preferred, and then used everywhere where the concept of XClass / type is exposed on non-dev screens?