Rename tuskar classes and role.id to match the tuskar API

Change-Id: I9b83ee2abec21372ab8c84b23b0d25ff5b2d70fd