Renaming
Structural adapter pattern added