@jahonix See my post with the steps we took. We did essentially what you did, but we also removed any references to the wan interface before we did the find-and-replace. Perhaps the cycling of OPT* interfaces was unnecessary, but it help us with consistent organization (since we have almost 2 dozen interfaces, organization is essential).