Fix some package name descrepencies

Change-Id: I2b09e425e777895f4147022d0f965ab200731ef4