Merge "[Bluetooth apex] Use new apex name"