Renamed plugin and packages