LPS-35566 Apply changes to plugins
LPS-35566 Rename typeId to classTypeId
LPS-35566 SF