Update for renamed sdk classes

Merged Martin Lange requested to merge renaming into main

Merge request reports