Fix names of packages

Change-Id: I5bfde80c42d5809d299e1f1467fc0dad64ce30a3