Update comments to use 2.0 syntax type names.