Package name updates part 3