Re-add `Template` suffix