Bug 11695 - Sort out the packages' names

Summary: Sort out the packages' names