Applied renamed template keys to initial templates