Restore the plural form

- To be consistent with other entities in portal_skins.
- Also eliminate that potential main_template clash error.
Changelog.
Merge remote-tracking branch 'origin/master'