aligned template names to current state of db