Don't prefix plugins, just use their specified aliases.
Fix up .trash code.