Update plugins
Use long name
Add mappings