Re-added template names