BVAL-316 Fix role typo
BVAL-191 BVAL-387 Fix examples using the deprecated API