Upgrade RF syntax for v3.2 compatibility