Fix up naming schemes

Change-Id: Ie8f832dd0f2f37c04122421e55e72b816f2bd907