Update built-in fields to new validate hook syntax

Update built-in fields to new validate hook syntax #2370