Make some names shorter
Add start of disco plugin