Improve template names (separate display name from url)