8951 Update prototypes to 2018