fix roles/rioles_definition with new convention.

M