Give bm nodes more appropriate name

Change-Id: Ie24e7839b3e334bcebfe94f865f6998b211d2c69