Rename/move variables to reduce chance of collision

I made another plugin with a $PluginId variable, and all hell broke
loose!