Remove unecessary packages and update names where required. Change-Id: Id76a64dccc3a48bbc1e7b95337cd99acdc0e6cf3