BT: Device name suffix is now added appropriately
Also some code cleanup