Also correct some package names. They were quite random, I wonder if
it was working and they are needed for something.

Change-Id: I5080f1f7eda967b602b6fac667018e11aec5a521