Changed plugin and package references