Fixing merge with old plugin
Renaming packages