Fix for changed adapter names, minimize imports

Merge request reports

Loading