Rename source package name too.

Change-Id: I025bb8654ade6ca15bd9a7f11ba14aa596c1826b