Renaming a couple of packages

Change-Id: I2c0f86b51baa622df629206f8b79ef1d0df09119
53 files changed