I'm not sure about these two. Because templates and plugins can have the same name (e.g. "sidebar"), I would add "Plugin" and "Template" back in.