Update element renaming to work with the updated parser.