Be more consistent about plugin naming.