use layer names as roles

Change-Id: I0c8cbe26fdeae13fa106c397e162ee771d20818e