LPS-35566 Rename typeId to classTypeId