[adapters] fix a name stomping error (entity) Also give proper name to subject (role, not target), and kill unused variable.

Summary
-------
%(longdesc)s