Fix for changed adapter names, minimize imports

Merged Martin Lange requested to merge fix-adapter-names into main

Merge request reports