fix roles/roles_definition with new convention.

M