fix roles definition to be independent of xp5k.

M