packages: Rename the last two packages

This updates our package names to be more in line with the BSP naming scheme.

Change-Id: Iee24835427978cd807937dcb13c75d906b809efb
2 files changed