Renaming legacy adapter classes