Fix terminology
Add 'splitjoin' plugin