Add missing finalName tags where missing to fix bug 910704