Renamed packages to fit the chart naming scheme.