Merge "Fixed Bluetooth renaming bug." into lmp-dev