More fixes to work with installing/deleting plugins following new structure

* Resolve some ambiguities around plugin_name vs pacakge_name