Added adapters.
Renamed some artifacts.