renamed packages to reflect new branding